# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1207167440 0
# Node ID e2159923235d4219d8e308850434cb362ac2cc21
# Parent  d4564d8c8835ec7c7d0b4a4a72a8d7e437bbd490
(cua-mode): Turn off shift-select-mode.

diff -r d4564d8c8835 -r e2159923235d lisp/emulation/cua-base.el
--- a/lisp/emulation/cua-base.el	Wed Apr 02 20:17:05 2008 +0000
+++ b/lisp/emulation/cua-base.el	Wed Apr 02 20:17:20 2008 +0000
@@ -1579,12 +1579,14 @@
 	  (list
 	   transient-mark-mode
 	   (and (boundp 'delete-selection-mode) delete-selection-mode)
-	   (and (boundp 'pc-selection-mode) pc-selection-mode)))
+	   (and (boundp 'pc-selection-mode) pc-selection-mode)
+	   shift-select-mode))
     (if (and (boundp 'delete-selection-mode) delete-selection-mode)
 	(delete-selection-mode -1))
     (if (and (boundp 'pc-selection-mode) pc-selection-mode)
 	(pc-selection-mode -1))
     (cua--deactivate)
+    (setq shift-select-mode nil)
     (setq transient-mark-mode (and cua-mode
 				   (if cua-highlight-region-shift-only
 				       (not cua--explicit-region-start)
@@ -1595,6 +1597,7 @@
 	(delete-selection-mode 1))
     (if (nth 2 cua--saved-state)
 	(pc-selection-mode 1))
+    (setq shift-select-mode (nth 3 cua--saved-state))
     (if (interactive-p)
 	(message "CUA mode disabled.%s%s%s%s"
 		 (if (nth 1 cua--saved-state) " Delete-Selection" "")