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

[Miles Bader]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.595 emacs/lisp/simple.el:1.596
*** emacs/lisp/simple.el:1.595  Mon Mar 24 05:58:17 2003
--- emacs/lisp/simple.el        Mon Mar 31 16:49:09 2003
***************
*** 2424,2438 ****
    :type 'integer
    :group 'editing-basics)
  
- (defcustom pop-global-mark-quick-repeat nil
-   "*When non-nil, `pop-global-mark' can be repeated without the prefix key.
- E.g. \\[pop-global-mark] \\[set-mark-command] \\[set-mark-command] \
- pops to the third mark off the global mark ring.
- To cycle through the marks in the target buffer, \
- use \\[universal-argument] \\[set-mark-command] \\[set-mark-command]..."
-   :type 'boolean
-   :group 'editing-basics)
- 
  (defun pop-to-mark-command ()
    "Jump to mark, and pop a new position for mark off the ring
  \(does not affect global mark ring\)."
--- 2424,2429 ----
***************
*** 2467,2475 ****
  mark ring\).  Use \\[pop-global-mark] to jump to a mark off the global
  mark ring \(see `pop-global-mark'\).
  
! Repeating the \\[set-mark-command] command without the prefix jumps to the 
next
! position off the local mark ring.  See `pop-global-mark-quick-repeat' if you
! want the same effect for \\[pop-global-mark].
  
  With a double \\[universal-argument] prefix argument, e.g. 
\\[universal-argument] \
  \\[universal-argument] \\[set-mark-command], unconditionally
--- 2458,2465 ----
  mark ring\).  Use \\[pop-global-mark] to jump to a mark off the global
  mark ring \(see `pop-global-mark'\).
  
! Repeating the \\[set-mark-command] command without the prefix jumps to
! the next position off the local (or global) mark ring.
  
  With a double \\[universal-argument] prefix argument, e.g. 
\\[universal-argument] \
  \\[universal-argument] \\[set-mark-command], unconditionally
***************
*** 2490,2497 ****
     ((eq last-command 'pop-to-mark-command)
      (setq this-command 'pop-to-mark-command)
      (pop-to-mark-command))
!    ((and pop-global-mark-quick-repeat
!        (eq last-command 'pop-global-mark) (not arg))
      (setq this-command 'pop-global-mark)
      (pop-global-mark))
     (arg
--- 2480,2486 ----
     ((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