1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-14 16:50:58 +00:00

(pop-to-mark-command): Do not set this-command.

(set-mark-command): Always jump to mark when called with arg.
This commit is contained in:
Kim F. Storm 2002-04-18 22:16:50 +00:00
parent ccb6090a07
commit 1841f9e393
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2002-04-19 Kim F. Storm <storm@cua.dk>
* simple.el (pop-to-mark-command): Do not set this-command.
(set-mark-command): Always jump to mark when called with arg.
2002-04-18 Francesco Potorti` <pot@gnu.org>
* comint.el (comint-watch-for-password-prompt): Remove whitespace

View File

@ -2294,7 +2294,6 @@ Start discarding off end if gets this big."
(interactive)
(if (null (mark t))
(error "No mark set in this buffer")
(setq this-command 'pop-to-mark-command)
(goto-char (mark t))
(pop-mark)))
@ -2325,12 +2324,16 @@ purposes. See the documentation of `set-mark' for more information."
(setq transient-mark-mode nil))
(cond
((not (eq this-command 'set-mark-command))
(push-mark-command t))
(if arg
(pop-to-mark-command)
(push-mark-command t)))
((eq last-command 'pop-to-mark-command)
(if (and (consp arg) (> (prefix-numeric-value arg) 4))
(push-mark-command nil)
(setq this-command 'pop-to-mark-command)
(pop-to-mark-command)))
(arg
(setq this-command 'pop-to-mark-command)
(pop-to-mark-command))
((and (eq last-command 'set-mark-command)
mark-active (null transient-mark-mode))