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

[Kim F . Storm]

Index: emacs/lisp/emulation/cua-base.el
diff -c emacs/lisp/emulation/cua-base.el:1.37 
emacs/lisp/emulation/cua-base.el:1.38
*** emacs/lisp/emulation/cua-base.el:1.37       Sat Oct 30 22:38:12 2004
--- emacs/lisp/emulation/cua-base.el    Tue Dec 14 12:18:30 2004
***************
*** 1003,1016 ****
  (defvar cua-movement-commands nil
    "User may add additional movement commands to this list.")
  
- (defvar cua--preserve-mark-commands
-   '(end-of-buffer beginning-of-buffer)
-   "List of movement commands that move the mark.
- CUA will preserve the previous mark position if a mark is already
- active before one of these commands is executed.")
- 
- (defvar cua--undo-push-mark nil)
- 
  ;;; Scrolling commands which does not signal errors at top/bottom
  ;;; of buffer at first key-press (instead moves to top/bottom
  ;;; of buffer).
--- 1003,1008 ----
***************
*** 1100,1110 ****
                            (aref (if window-system
                                      (this-single-command-raw-keys)
                                    (this-single-command-keys)) 0)))
!             (if mark-active
!                 (if (and (memq this-command cua--preserve-mark-commands)
!                          (not inhibit-mark-movement))
!                     (setq cua--undo-push-mark t
!                           inhibit-mark-movement t))
                (push-mark-command nil t))
              (setq cua--last-region-shifted t)
              (setq cua--explicit-region-start nil))
--- 1092,1098 ----
                            (aref (if window-system
                                      (this-single-command-raw-keys)
                                    (this-single-command-keys)) 0)))
!             (unless mark-active
                (push-mark-command nil t))
              (setq cua--last-region-shifted t)
              (setq cua--explicit-region-start nil))
***************
*** 1151,1159 ****
  (defun cua--post-command-handler ()
    (condition-case nil
        (progn
-       (when cua--undo-push-mark
-         (setq cua--undo-push-mark nil
-               inhibit-mark-movement nil))
        (when cua--global-mark-active
          (cua--global-mark-post-command))
        (when (fboundp 'cua--rectangle-post-command)
--- 1139,1144 ----