# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1103026710 0
# Node ID e1b2a6ac991bd24f8675b84718d81dfd96c4aa85
# Parent  eb752b1a84b11c1325f062018aa5cf8f8e1f6b45
(cua--preserve-mark-commands): Remove.
(cua--undo-push-mark): Remove.
(cua--pre-command-handler, cua--post-command-handler): Don't
fiddle with inhibit-mark-movement.

diff -r eb752b1a84b1 -r e1b2a6ac991b lisp/emulation/cua-base.el
--- a/lisp/emulation/cua-base.el	Tue Dec 14 12:18:11 2004 +0000
+++ b/lisp/emulation/cua-base.el	Tue Dec 14 12:18:30 2004 +0000
@@ -1003,14 +1003,6 @@
 (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 @@
 			    (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 @@
 (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)