* 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).

1 files changed, 3 insertions, 2 deletions

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)