[Emacs-diffs] Changes to emacs/lisp/simple.el

[Kim F. Storm]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.535 emacs/lisp/simple.el:1.536
*** emacs/lisp/simple.el:1.535  Sun Apr 14 13:27:55 2002
--- emacs/lisp/simple.el        Thu Apr 18 18:16:00 2002
***************
*** 2294,2300 ****
    (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)))
  
--- 2294,2299 ----
***************
*** 2325,2336 ****
        (setq transient-mark-mode nil))
    (cond
     ((not (eq this-command 'set-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)
        (pop-to-mark-command)))
     (arg
      (pop-to-mark-command))
     ((and (eq last-command 'set-mark-command)
         mark-active (null transient-mark-mode))
--- 2324,2339 ----
        (setq transient-mark-mode nil))
    (cond
     ((not (eq this-command 'set-mark-command))
!     (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))