# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1105490577 0
# Node ID 3b3f211ffa93082dbbf48befb35e78cedef05cbf
# Parent  ad03a223e4e1eb27f20e925a8846765e9b75e338
(pop-mark): Move deactivate-mark out of conditional
part to deactivate the active mark regardless of the state of the
mark ring.

diff -r ad03a223e4e1 -r 3b3f211ffa93 lisp/simple.el
--- a/lisp/simple.el	Wed Jan 12 00:33:00 2005 +0000
+++ b/lisp/simple.el	Wed Jan 12 00:42:57 2005 +0000
@@ -3008,10 +3008,10 @@
   (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)