From: Kim F. Storm <storm@cua.dk>
Date: Tue, 1 Nov 2005 23:21:39 +0000 (+0000)
Subject: (menu-bar-options-menu): Show "Shift Movement (CUA)"
X-Git-Tag: emacs-pretest-22.0.90~6124
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=899481b730c37d959d466846299cc99f5f7c37fb;p=emacs.git

(menu-bar-options-menu): Show "Shift Movement (CUA)"
item instead of "C-x/C-c/C-v (CUA)" if cua-enable-cua-keys is nil.
---

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index f32088d1b88..902b48e0a50 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1003,7 +1003,16 @@ mail status in mode line"))
 (define-key menu-bar-options-menu [cua-mode]
   (menu-bar-make-mm-toggle cua-mode
 			   "C-x/C-c/C-v Cut and Paste (CUA)"
-			   "Use C-z/C-x/C-c/C-v keys for undo/cut/copy/paste"))
+			   "Use C-z/C-x/C-c/C-v keys for undo/cut/copy/paste"
+			   (:visible (or (not (boundp 'cua-enable-cua-keys))
+					 cua-enable-cua-keys))))
+
+(define-key menu-bar-options-menu [cua-emulation-mode]
+  (menu-bar-make-mm-toggle cua-mode
+			   "Shift movement mark region (CUA)"
+			   "Use shifted movement keys to set and extend the region."
+			   (:visible (and (boundp 'cua-enable-cua-keys)
+					  (not cua-enable-cua-keys)))))
 
 (define-key menu-bar-options-menu [case-fold-search]
   (menu-bar-make-toggle toggle-case-fold-search case-fold-search