Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-79

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-735
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-747
   Update from CVS

1 files changed, 1 insertions, 16 deletions

diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 523a07d26de..24adae30040 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1003,14 +1003,6 @@ Extra commands should be added to `cua-movement-commands'")
 (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).
@@ -1100,11 +1092,7 @@ If ARG is the atom `-', scroll upward by nearly full screen."
                             (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))
+              (unless mark-active
                 (push-mark-command nil t))
               (setq cua--last-region-shifted t)
               (setq cua--explicit-region-start nil))
@@ -1151,9 +1139,6 @@ If ARG is the atom `-', scroll upward by nearly full screen."
 (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)