# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1019168160 0
# Node ID 92b336df72b8b4757e8fa009756d0f6b2be03bc0
# Parent  0dc61586b8019cb2085705a02eef1e4bd96bb6dd
(pop-to-mark-command): Do not set this-command.
(set-mark-command): Always jump to mark when called with arg.

diff -r 0dc61586b801 -r 92b336df72b8 lisp/simple.el
--- 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))