[Emacs-diffs] Changes to emacs/lisp/emulation/cua-base.el

[Miles Bader]

Index: emacs/lisp/emulation/cua-base.el
diff -c emacs/lisp/emulation/cua-base.el:1.22 
emacs/lisp/emulation/cua-base.el:1.23
*** emacs/lisp/emulation/cua-base.el:1.22       Mon Mar 24 06:01:17 2003
--- emacs/lisp/emulation/cua-base.el    Mon Mar 31 16:48:39 2003
***************
*** 878,885 ****
  With argument, jump to mark, and pop a new position for mark off
  the local mark ring \(this does not affect the global mark ring\).
  Use \\[pop-global-mark] to jump to a mark off the global mark ring
! \(see `pop-global-mark'\).  Repeating the command without the prefix
! jumps to the next position off the local \(or global\) mark ring.
  
  With a double \\[universal-argument] prefix argument, unconditionally set 
mark."
    (interactive "P")
--- 878,887 ----
  With argument, jump to mark, and pop a new position for mark off
  the local mark ring \(this does not affect the global mark ring\).
  Use \\[pop-global-mark] to jump to a mark off the global mark ring
! \(see `pop-global-mark'\).
! 
! Repeating the command without the prefix jumps to the next position
! off the local \(or global\) mark ring.
  
  With a double \\[universal-argument] prefix argument, unconditionally set 
mark."
    (interactive "P")
***************
*** 889,896 ****
     ((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
--- 891,897 ----
     ((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