(calc-embedded-close-formula, calc-embedded-open-formula,

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

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index cbfc78fb95fb990022dc690777d0b7e441748ca3..302ede8c8ff9bb3bfb838eb2bea2e64649d84990 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -105,6 +105,10 @@ A large number or nil slows down menu responsiveness."
 
 (define-key menu-bar-file-menu [split-window]
   '(menu-item "Split Window" split-window-vertically
+             :enable (and (frame-live-p menu-updating-frame)
+                          (frame-visible-p menu-updating-frame )
+                          (not (window-minibuffer-p
+                                (frame-selected-window menu-updating-frame))))
              :help "Split selected window in two windows"))
 
 (define-key menu-bar-file-menu [separator-window]
@@ -116,6 +120,8 @@ A large number or nil slows down menu responsiveness."
              :help "Pretty-print marked region in black and white to PostScript printer"))
 (define-key menu-bar-file-menu [ps-print-buffer]
   '(menu-item "Postscript Print Buffer (B+W)" ps-print-buffer
+             :enable (and (frame-live-p menu-updating-frame)
+                          (frame-visible-p menu-updating-frame ))
              :help "Pretty-print current buffer in black and white to PostScript printer"))
 (define-key menu-bar-file-menu [ps-print-region-faces]
   '(menu-item "Postscript Print Region" ps-print-region-with-faces
@@ -123,6 +129,8 @@ A large number or nil slows down menu responsiveness."
              :help "Pretty-print marked region to PostScript printer"))
 (define-key menu-bar-file-menu [ps-print-buffer-faces]
   '(menu-item "Postscript Print Buffer" ps-print-buffer-with-faces
+             :enable (and (frame-live-p menu-updating-frame)
+                          (frame-visible-p menu-updating-frame ))
              :help "Pretty-print current buffer to PostScript printer"))
 (define-key menu-bar-file-menu [print-region]
   '(menu-item "Print Region" print-region
@@ -130,6 +138,8 @@ A large number or nil slows down menu responsiveness."
              :help "Print region between mark and current position"))
 (define-key menu-bar-file-menu [print-buffer]
   '(menu-item "Print Buffer" print-buffer
+             :enable (and (frame-live-p menu-updating-frame)
+                          (frame-visible-p menu-updating-frame ))
              :help "Print current buffer with page headings"))
 
 (define-key menu-bar-file-menu [separator-print]
@@ -160,8 +170,10 @@ A large number or nil slows down menu responsiveness."
              :help "Re-read current buffer from its file"))
 (define-key menu-bar-file-menu [write-file]
   '(menu-item "Save As..." write-file
-             :enable (not (window-minibuffer-p
-                           (frame-selected-window menu-updating-frame)))
+             :enable (and (frame-live-p menu-updating-frame)
+                          (frame-visible-p menu-updating-frame )
+                          (not (window-minibuffer-p
+                                (frame-selected-window menu-updating-frame))))
              :help "Write current buffer to another file"))
 (define-key menu-bar-file-menu [save-buffer]
   '(menu-item "Save" save-buffer
@@ -641,7 +653,8 @@ 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))
+                  global-font-lock-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'.
@@ -650,7 +663,7 @@ by \"Save Options\" in Custom buffers.")
                   tooltip-mode menu-bar-mode tool-bar-mode
                   save-place uniquify-buffer-name-style fringe-mode
                   indicate-empty-lines indicate-buffer-boundaries
-                  case-fold-search display-time-mode auto-compression-mode
+                  case-fold-search
                   current-language-environment default-input-method
                   ;; Saving `text-mode-hook' is somewhat questionable,
                   ;; as we might get more than we bargain for, if
@@ -700,10 +713,16 @@ by \"Save Options\" in Custom buffers.")
 (define-key menu-bar-showhide-menu [linecolumn-separator]
   '("--"))
 
+(define-key menu-bar-showhide-menu [showhide-battery]
+  (menu-bar-make-mm-toggle display-battery-mode
+                          "Battery Status"
+                          "Display battery status information in mode line"))
+
 (define-key menu-bar-showhide-menu [showhide-date-time]
   (menu-bar-make-mm-toggle display-time-mode
-                          "Date, Time and Mail"
-                          "Display date, time, mail status in mode line"))
+                          "Time, Load and Mail"
+                          "Display time, system load averages and \
+mail status in mode line"))
 
 (define-key menu-bar-showhide-menu [datetime-separator]
   '("--"))
@@ -728,7 +747,7 @@ by \"Save Options\" in Custom buffers.")
   (customize-variable 'indicate-buffer-boundaries))
 
 (define-key menu-bar-showhide-fringe-ind-menu [customize]
-  '(menu-item "Other (customize)"
+  '(menu-item "Other (Customize)"
              menu-bar-showhide-fringe-ind-customize
              :help "Additional choices available through Custom buffer"
              :visible (display-graphic-p)))
@@ -740,7 +759,7 @@ by \"Save Options\" in Custom buffers.")
                          '((t . right) (top . left))))
 
 (define-key menu-bar-showhide-fringe-ind-menu [mixed]
-  '(menu-item "Opposite, arrows right" menu-bar-showhide-fringe-ind-mixed
+  '(menu-item "Opposite, Arrows Right" menu-bar-showhide-fringe-ind-mixed
              :help
              "Show top/bottom indicators in opposite fringes, arrows in right"
              :visible (display-graphic-p)
@@ -754,7 +773,7 @@ by \"Save Options\" in Custom buffers.")
                          '((top . left) (bottom . right))))
 
 (define-key menu-bar-showhide-fringe-ind-menu [box]
-  '(menu-item "Opposite, no arrows" menu-bar-showhide-fringe-ind-box
+  '(menu-item "Opposite, No Arrows" menu-bar-showhide-fringe-ind-box
              :help "Show top/bottom indicators in opposite fringes, no arrows"
              :visible (display-graphic-p)
              :button (:radio . (eq indicate-buffer-boundaries
@@ -766,7 +785,7 @@ by \"Save Options\" in Custom buffers.")
   (customize-set-variable 'indicate-buffer-boundaries 'right))
 
 (define-key menu-bar-showhide-fringe-ind-menu [right]
-  '(menu-item "In right fringe" menu-bar-showhide-fringe-ind-right
+  '(menu-item "In Right Fringe" menu-bar-showhide-fringe-ind-right
              :help "Show buffer boundaries and arrows in right fringe"
              :visible (display-graphic-p)
              :button (:radio . (eq indicate-buffer-boundaries 'right))))
@@ -777,7 +796,7 @@ by \"Save Options\" in Custom buffers.")
   (customize-set-variable 'indicate-buffer-boundaries 'left))
 
 (define-key menu-bar-showhide-fringe-ind-menu [left]
-  '(menu-item "In left fringe" menu-bar-showhide-fringe-ind-left
+  '(menu-item "In Left Fringe" menu-bar-showhide-fringe-ind-left
              :help "Show buffer boundaries and arrows in left fringe"
              :visible (display-graphic-p)
              :button (:radio . (eq indicate-buffer-boundaries 'left))))
@@ -788,19 +807,19 @@ by \"Save Options\" in Custom buffers.")
   (customize-set-variable 'indicate-buffer-boundaries nil))
 
 (define-key menu-bar-showhide-fringe-ind-menu [none]
-  '(menu-item "No indicators" menu-bar-showhide-fringe-ind-none
+  '(menu-item "No Indicators" menu-bar-showhide-fringe-ind-none
              :help "Hide all buffer boundary indicators and arrows"
              :visible (display-graphic-p)
              :button (:radio . (eq indicate-buffer-boundaries nil))))
 
 (define-key menu-bar-showhide-fringe-menu [showhide-fringe-ind]
-  (list 'menu-item "Buffer boundaries" menu-bar-showhide-fringe-ind-menu
+  (list 'menu-item "Buffer Boundaries" menu-bar-showhide-fringe-ind-menu
        :visible `(display-graphic-p)
        :help "Indicate buffer boundaries in fringe"))
 
 (define-key menu-bar-showhide-fringe-menu [indicate-empty-lines]
   (menu-bar-make-toggle toggle-indicate-empty-lines indicate-empty-lines
-                       "Empty line indicators"
+                       "Empty Line Indicators"
                        "Indicating of empty lines %s"
                        "Indicate trailing empty lines in fringe"))
 
@@ -810,7 +829,7 @@ by \"Save Options\" in Custom buffers.")
   (customize-variable 'fringe-mode))
 
 (define-key menu-bar-showhide-fringe-menu [customize]
-  '(menu-item "Customize fringe" menu-bar-showhide-fringe-menu-customize
+  '(menu-item "Customize Fringe" menu-bar-showhide-fringe-menu-customize
              :help "Detailed customization of fringe"
              :visible (display-graphic-p)))
 
@@ -970,13 +989,6 @@ by \"Save Options\" in Custom buffers.")
 (define-key menu-bar-options-menu [cursor-separator]
   '("--"))
 
-(define-key menu-bar-options-menu [toggle-auto-compression]
-  '(menu-item "Automatic File De/compression"
-             auto-compression-mode
-             :help "Transparently decompress compressed files"
-             :button (:toggle . (rassq 'jka-compr-handler
-                                       file-name-handler-alist))))
-
 (define-key menu-bar-options-menu [save-place]
   (menu-bar-make-toggle toggle-save-place-globally save-place
                        "Save Place in Files between Sessions"
@@ -1002,7 +1014,7 @@ by \"Save Options\" in Custom buffers.")
   '("--"))
 (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)"
+                          "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"))
 
 (define-key menu-bar-options-menu [case-fold-search]
@@ -1030,7 +1042,9 @@ by \"Save Options\" in Custom buffers.")
   '(menu-item "Truncate Long Lines in this Buffer"
              toggle-truncate-lines
              :help "Truncate long lines on the screen"
-             :button (:toggle . truncate-lines)))
+             :button (:toggle . truncate-lines)
+             :enable (and (frame-live-p menu-updating-frame)
+                          (frame-visible-p menu-updating-frame))))
 
 (define-key menu-bar-options-menu [highlight-separator]
   '("--"))
@@ -1248,15 +1262,10 @@ by \"Save Options\" in Custom buffers.")
   '(menu-item "Describe Function..." describe-function
              :help "Display documentation of function/command"))
 (define-key menu-bar-describe-menu [describe-key-1]
-  '(menu-item "Describe Key..." describe-key
-             ;; Users typically don't identify keys and menu items...
-             :help "Display documentation of command bound to a \
-key (or menu-item)"))
-(define-key menu-bar-describe-menu [describe-key]
-  '(menu-item "What's This? " describe-key
+  '(menu-item "Describe Key or Mouse Operation..." describe-key
              ;; Users typically don't identify keys and menu items...
              :help "Display documentation of command bound to a \
-key (or menu-item)"))
+key, a click, or a menu-item"))
 (define-key menu-bar-describe-menu [describe-mode]
   '(menu-item "Describe Buffer Modes" describe-mode
              :help "Describe this buffer's major and minor mode"))