diff options
| author | Juri Linkov <juri@jurta.org> | 2005-01-12 00:42:57 +0000 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2005-01-12 00:42:57 +0000 |
| commit | 0137bae6053ee443661d6b11a0cf7e383593b5fb (patch) | |
| tree | 0b5ccd39263474d5eab6ca0f82332d7afaf6a6b6 /lisp/simple.el | |
| parent | 987d1819c1486eb76d341ba22c8152fd07c89005 (diff) | |
| download | emacs-0137bae6053ee443661d6b11a0cf7e383593b5fb.tar.gz | |
(pop-mark): Move deactivate-mark out of conditional
part to deactivate the active mark regardless of the state of the
mark ring.
Diffstat (limited to 'lisp/simple.el')
| -rw-r--r-- | lisp/simple.el | 4 |
1 files 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) |