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

[Richard M . Stallman]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.760 emacs/lisp/simple.el:1.761
*** emacs/lisp/simple.el:1.760  Tue Nov  1 07:18:10 2005
--- emacs/lisp/simple.el        Thu Nov  3 21:41:20 2005
***************
*** 3115,3120 ****
--- 3115,3127 ----
        (unless nomsg
        (message "Mark activated")))))
  
+ (defcustom set-mark-command-repeat-pop nil
+   "*Non-nil means that repeating \\[set-mark-command] after popping will pop.
+ This means that if you type C-u \\[set-mark-command] \\[set-mark-command]
+ will pop twice."
+   :type 'boolean
+   :group 'editing)
+ 
  (defun set-mark-command (arg)
    "Set mark at where point is, or jump to mark.
  With no prefix argument, set mark, and push old mark position on local
***************
*** 3147,3156 ****
      (if arg
        (pop-to-mark-command)
        (push-mark-command t)))
!    ((eq last-command 'pop-to-mark-command)
      (setq this-command 'pop-to-mark-command)
      (pop-to-mark-command))
!    ((and (eq last-command 'pop-global-mark) (not arg))
      (setq this-command 'pop-global-mark)
      (pop-global-mark))
     (arg
--- 3154,3166 ----
      (if arg
        (pop-to-mark-command)
        (push-mark-command t)))
!    ((and set-mark-command-repeat-pop
!        (eq last-command 'pop-to-mark-command))
      (setq this-command 'pop-to-mark-command)
      (pop-to-mark-command))
!    ((and set-mark-command-repeat-pop
!        (eq last-command 'pop-global-mark)
!        (not arg))
      (setq this-command 'pop-global-mark)
      (pop-global-mark))
     (arg