(menu-bar-edit-menu): Add listp around pending-undo-list to disable

[gnu-emacs] / lisp / menu-bar.el

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 9a5d47656abe081f7edf6ce0f80f0e2852aaa275..56745d82cc4f64a1d66c85a8b87868ceddb6db8b 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -481,7 +481,7 @@ A large number or nil slows down menu responsiveness."
              :enable (and (not buffer-read-only)
                           (not (eq t buffer-undo-list))
                           (if (eq last-command 'undo)
-                              pending-undo-list
+                              (listp pending-undo-list)
                             (consp buffer-undo-list)))
              :help "Undo last operation"))
 
@@ -641,8 +641,7 @@ by \"Save Options\" in Custom buffers.")
     ;; put on a customized-value property.
     (dolist (elt '(line-number-mode column-number-mode size-indication-mode
                   cua-mode show-paren-mode transient-mark-mode
-                  global-font-lock-mode blink-cursor-mode
-                  display-time-mode display-battery-mode))
+                  blink-cursor-mode display-time-mode display-battery-mode))
       (and (customize-mark-to-save elt)
           (setq need-save t)))
     ;; These are set with `customize-set-variable'.
@@ -1003,7 +1002,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
@@ -1044,10 +1052,6 @@ mail status in mode line"))
                           "Active Region Highlighting"
                           "Make text in active region stand out in color (Transient Mark mode)"
                           (:enable (not cua-mode))))
-(define-key menu-bar-options-menu [toggle-global-lazy-font-lock-mode]
-  (menu-bar-make-mm-toggle global-font-lock-mode
-                          "Syntax Highlighting"
-                          "Colorize text based on language syntax (Global Font Lock mode)"))
 
 \f
 ;; The "Tools" menu items
@@ -1235,7 +1239,7 @@ mail status in mode line"))
 
 (define-key menu-bar-describe-menu [list-keybindings]
   '(menu-item "List Key Bindings" describe-bindings
-             :help "Display a list of all current keybindings"))
+             :help "Display all current keybindings (keyboard shortcuts)"))
 (define-key menu-bar-describe-menu [describe-current-display-table]
   '(menu-item "Describe Display Table" describe-current-display-table
              :help "Describe the current display table"))
@@ -1342,7 +1346,7 @@ key, a click, or a menu-item"))
              :help "Display manual section that describes a key"))
 
 (define-key menu-bar-help-menu [eliza]
-  '(menu-item "Emacs Psychiatrist" doctor
+  '(menu-item "Emacs Psychotherapist" doctor
              :help "Our doctor will help you feel better"))
 (define-key menu-bar-help-menu [sep4]
   '("--"))
@@ -1356,9 +1360,8 @@ key, a click, or a menu-item"))
   '(menu-item "Getting New Versions" describe-distribution
              :help "How to get latest versions of Emacs"))
 (define-key menu-bar-help-menu [more]
-  '(menu-item "Find Extra Packages"
-             menu-bar-help-extra-packages
-             :help "Where to find some extra packages and possible updates"))
+  '(menu-item "External Packages" menu-bar-help-extra-packages
+             :help "Lisp packages distributed separately for use in Emacs"))
 (defun menu-bar-help-extra-packages ()
   "Display help about some additional packages available for Emacs."
   (interactive)