Mercurial > emacs

changeset 59486:3b3f211ffa93

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(pop-mark): Move deactivate-mark out of conditional part to deactivate the active mark regardless of the state of the mark ring.
author Juri Linkov <juri@jurta.org>
date Wed, 12 Jan 2005 00:42:57 +0000
parents ad03a223e4e1
children c1de47aaf80f
files lisp/simple.el
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)