Delete dereferenced marker if some (#1891)

* helm-ring.el (helm-mark-ring-default-action): Check if marker point
to a buffer, if so jump to it, calling hook etc.. otherwise remove
this marker from mark-ring.

1 files changed, 12 insertions, 7 deletions

diff --git a/helm-ring.el b/helm-ring.el
index 46a15810..a8589360 100644
--- a/helm-ring.el
+++ b/helm-ring.el
@@ -257,13 +257,18 @@ This is a command for `helm-kill-ring-map'."
 
 (defun helm-mark-ring-default-action (candidate)
   (let ((target (copy-marker candidate)))
-    (switch-to-buffer (marker-buffer candidate))
-    (helm-log-run-hook 'helm-goto-line-before-hook)
-    (helm-match-line-cleanup)
-    (with-helm-current-buffer
-      (unless helm-yank-point (setq helm-yank-point (point))))
-    (helm-goto-char target)
-    (helm-highlight-current-line)))
+    (helm-aif (marker-buffer candidate)
+        (progn
+          (switch-to-buffer it)
+          (helm-log-run-hook 'helm-goto-line-before-hook)
+          (helm-match-line-cleanup)
+          (with-helm-current-buffer
+            (unless helm-yank-point (setq helm-yank-point (point))))
+          (helm-goto-char target)
+          (helm-highlight-current-line))
+      ;; marker point to no buffer, no need to dereference it, just
+      ;; delete it.
+      (setq mark-ring (delete target mark-ring)))))
 
 (defvar helm-source-mark-ring
   (helm-build-sync-source "mark-ring"