Mercurial > emacs

changeset 44664:92b336df72b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(pop-to-mark-command): Do not set this-command. (set-mark-command): Always jump to mark when called with arg.
author Kim F. Storm <storm@cua.dk>
date Thu, 18 Apr 2002 22:16:00 +0000
parents 0dc61586b801
children cfc54353fe68
files lisp/simple.el
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/simple.el	Thu Apr 18 19:41:57 2002 +0000
+++ b/lisp/simple.el	Thu Apr 18 22:16:00 2002 +0000
@@ -2294,7 +2294,6 @@
   (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 @@
       (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))