From: Kim F. Storm <storm@cua.dk>
Date: Sat, 25 Jan 2003 11:41:58 +0000 (+0000)
Subject: * emulation/cua-base.el (cua--init-keymaps): Move C-S-x and C-S-c
X-Git-Tag: ttn-vms-21-2-B4~11495
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d6f9ff152a19d0359a108088200fcbdaa0da5b3b;p=emacs.git

* emulation/cua-base.el (cua--init-keymaps): Move C-S-x and C-S-c
bindings from cua--cua-keys-keymap to cua--region-keymap, as they are
only needed when the region is active.  This also makes the output
from C-h b look normal when cua-mode is enabled (no C-S-x/c bindings).
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bfe0c092b4f..16cf0bac0da 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-25  Kim F. Storm  <storm@cua.dk>
+
+	* emulation/cua-base.el (cua--init-keymaps): Move C-S-x and C-S-c
+	bindings from cua--cua-keys-keymap to cua--region-keymap, as they are
+	only needed when the region is active.  This also makes the output
+	from C-h b look normal when cua-mode is enabled (no C-S-x/c bindings).
+
 2003-01-25  Michael Kifer  <kifer@cs.stonybrook.edu>
 	
         * ediff.el (ediff-revision): better defaults.
@@ -10,12 +17,10 @@
 	* info.el (Info-extract-menu-node-name): When looking for end of menu
 	item, don't stop at first ":"; instead, continue until trailing
 	context is either a space or newline.
-	(Info-complete-menu-item): Change var `pattern' to allow ":" in menu
-	item.
+	(Info-complete-menu-item): Var `pattern': allow ":" in menu item.
 	(Info-menu): Likewise, for regexp used in backwards search.
 	(Info-try-follow-nearest-node): Remove case added in previous edit.
-	Instead, change the regexp in the following case to allow ":" in menu
-	item.
+	Change regexp in the following case to allow ":" in menu item.
 	(Info-fontify-node): Fix bug: Handle `next-property-change' returning
 	point-max as "hasn't already been done".
 
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 9018e0e95d3..8a2efcc8b0e 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1115,9 +1115,7 @@ Extra commands should be added to `cua-user-movement-commands'")
   (define-key cua-global-keymap [remap advertised-undo]	'cua-undo)
 
   (define-key cua--cua-keys-keymap [(control x) timeout] 'kill-region)
-  (define-key cua--cua-keys-keymap [(shift control x)] 'Control-X-prefix)
   (define-key cua--cua-keys-keymap [(control c) timeout] 'copy-region-as-kill)
-  (define-key cua--cua-keys-keymap [(shift control c)] 'mode-specific-command-prefix)
   (define-key cua--cua-keys-keymap [(control z)] 'undo)
   (define-key cua--cua-keys-keymap [(control v)] 'yank)
   (define-key cua--cua-keys-keymap [(meta v)] 'cua-repeat-replace-region)
@@ -1137,6 +1135,9 @@ Extra commands should be added to `cua-user-movement-commands'")
   (define-key cua--prefix-repeat-keymap [(control c) left]  'cua--prefix-copy-handler)
   (define-key cua--prefix-repeat-keymap [(control c) right] 'cua--prefix-copy-handler)
 
+  ;; Enable shifted fallbacks for C-x and C-c when region is active 
+  (define-key cua--region-keymap [(shift control x)] 'Control-X-prefix)
+  (define-key cua--region-keymap [(shift control c)] 'mode-specific-command-prefix)
   ;; replace current region
   (define-key cua--region-keymap [remap self-insert-command]	'cua-replace-region)
   (define-key cua--region-keymap [remap self-insert-iso]	'cua-replace-region)