From 0137bae6053ee443661d6b11a0cf7e383593b5fb Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Wed, 12 Jan 2005 00:42:57 +0000 Subject: [PATCH] (pop-mark): Move deactivate-mark out of conditional part to deactivate the active mark regardless of the state of the mark ring. --- lisp/simple.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/simple.el b/lisp/simple.el index 565a6cba8ee..bdc51546a84 100644 --- 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) -- 2.39.5