[Emacs-diffs] Changes to emacs/lisp/menu-bar.el

[Eli Zaretskii]

Index: emacs/lisp/menu-bar.el
diff -c emacs/lisp/menu-bar.el:1.270 emacs/lisp/menu-bar.el:1.271
*** emacs/lisp/menu-bar.el:1.270        Thu Aug 25 19:09:37 2005
--- emacs/lisp/menu-bar.el      Fri Aug 26 14:10:59 2005
***************
*** 105,110 ****
--- 105,114 ----
  
  (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,121 ****
--- 120,127 ----
              :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,128 ****
--- 129,136 ----
              :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,135 ****
--- 138,145 ----
              :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,167 ****
              :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)))
              :help "Write current buffer to another file"))
  (define-key menu-bar-file-menu [save-buffer]
    '(menu-item "Save" save-buffer
--- 170,179 ----
              :help "Re-read current buffer from its file"))
  (define-key menu-bar-file-menu [write-file]
    '(menu-item "Save As..." write-file
!             :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
***************
*** 1030,1036 ****
    '(menu-item "Truncate Long Lines in this Buffer"
              toggle-truncate-lines
              :help "Truncate long lines on the screen"
!             :button (:toggle . truncate-lines)))
  
  (define-key menu-bar-options-menu [highlight-separator]
    '("--"))
--- 1042,1050 ----
    '(menu-item "Truncate Long Lines in this Buffer"
              toggle-truncate-lines
              :help "Truncate long lines on the screen"
!             :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]
    '("--"))