From: Kim F. Storm <storm@cua.dk>
Date: Mon, 3 May 2004 14:26:23 +0000 (+0000)
Subject: (cua-mode): Deactivate mark when cua-mode is enabled.
X-Git-Tag: ttn-vms-21-2-B4~6435
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ef2887a290f52844163e33662d7c0180d2b3cbbe;p=emacs.git

(cua-mode): Deactivate mark when cua-mode is enabled.
---

diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 6a0e8a00cde..51b47b104d0 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1336,6 +1336,7 @@ paste (in addition to the normal emacs bindings)."
 	(delete-selection-mode -1))
     (if (and (boundp 'pc-selection-mode) pc-selection-mode)
 	(pc-selection-mode -1))
+    (cua--deactivate)
     (setq transient-mark-mode (and cua-mode
 				   (if cua-highlight-region-shift-only
 				       (not cua--explicit-region-start)