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

(set-mark-command): Always jump to mark when called with arg.

2 files changed, 10 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f58dc9f6173..0f2530c5cea 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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
diff --git a/lisp/simple.el b/lisp/simple.el
index df7955098e0..71f33054dd1 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -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))