(pop-global-mark): Discard entries for nonexistent buffers.

diff --git a/lisp/simple.el b/lisp/simple.el
index 6dbfccad589628ada9753c3a5c6d4a0d9bff3468..e91ed2a51b8a785b0cefac73669b70c86c4a8863 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1450,6 +1450,9 @@ incremental search, \\[beginning-of-buffer], and \\[end-of-buffer]."
 (defun pop-global-mark ()
   "Pop off global mark ring and jump to the top location."
   (interactive)
+  ;; Pop entries which refer to non-existent buffers.
+  (while (and global-mark-ring (not (marker-buffer (car global-mark-ring))))
+    (setq global-mark-ring (cdr global-mark-ring)))
   (or global-mark-ring
       (error "No global mark set"))
   (let* ((marker (car global-mark-ring))