(pop-mark): Move deactivate-mark out of conditional

part to deactivate the active mark regardless of the state of the
mark ring.

diff --git a/lisp/simple.el b/lisp/simple.el
index 565a6cba8ee18a3a60d47b2497fe98a7d5f73cca..bdc51546a8492252d7fdc7de87f44022f398979b 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3008,10 +3008,10 @@ Does not set point.  Does nothing if mark ring is empty."
   (when mark-ring
     (setq mark-ring (nconc mark-ring (list (copy-marker (mark-marker)))))
     (set-marker (mark-marker) (+ 0 (car mark-ring)) (current-buffer))
-    (deactivate-mark)
     (move-marker (car mark-ring) nil)
     (if (null (mark t)) (ding))
-    (setq mark-ring (cdr mark-ring))))
+    (setq mark-ring (cdr mark-ring)))
+  (deactivate-mark))
 
 (defalias 'exchange-dot-and-mark 'exchange-point-and-mark)
 (defun exchange-point-and-mark (&optional arg)