[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.271 emacs/lisp/menu-bar.el:1.272
*** emacs/lisp/menu-bar.el:1.271        Fri Aug 26 14:10:59 2005
--- emacs/lisp/menu-bar.el      Fri Sep  9 13:40:46 2005
***************
*** 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]
--- 105,116 ----
  
  (define-key menu-bar-file-menu [split-window]
    '(menu-item "Split Window" split-window-vertically
!             :enable (or (not (display-multi-frame-p))
!                         (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]
***************
*** 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
--- 122,130 ----
              :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 (or (not (display-multi-frame-p))
!                         (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
***************
*** 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
--- 132,140 ----
              :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 (or (not (display-multi-frame-p))
!                         (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
***************
*** 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]
--- 142,150 ----
              :help "Print region between mark and current position"))
  (define-key menu-bar-file-menu [print-buffer]
    '(menu-item "Print Buffer" print-buffer
!             :enable (or (not (display-multi-frame-p))
!                         (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]
***************
*** 170,186 ****
              :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
              :enable (and (buffer-modified-p)
                           (buffer-file-name)
!                          (not (window-minibuffer-p
!                                (frame-selected-window menu-updating-frame))))
              :help "Save current buffer to its file"))
  
  (define-key menu-bar-file-menu [separator-save]
--- 175,195 ----
              :help "Re-read current buffer from its file"))
  (define-key menu-bar-file-menu [write-file]
    '(menu-item "Save As..." write-file
!             :enable (or (not (display-multi-frame-p))
!                         (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
              :enable (and (buffer-modified-p)
                           (buffer-file-name)
!                          (or (not (display-multi-frame-p))
!                              (not (window-minibuffer-p
!                                    (frame-selected-window
!                                     menu-updating-frame)))))
              :help "Save current buffer to its file"))
  
  (define-key menu-bar-file-menu [separator-save]
***************
*** 192,214 ****
              :help "Discard (kill) current buffer"))
  (define-key menu-bar-file-menu [insert-file]
    '(menu-item "Insert File..." insert-file
!             :enable (not (window-minibuffer-p
!                           (frame-selected-window menu-updating-frame)))
              :help "Insert another file into current buffer"))
  (define-key menu-bar-file-menu [dired]
    '(menu-item "Open Directory..." dired
!             :enable (not (window-minibuffer-p
!                           (frame-selected-window menu-updating-frame)))
              :help "Read a directory, operate on its files"))
  (define-key menu-bar-file-menu [open-file]
    '(menu-item "Open File..." find-file-existing
!             :enable (not (window-minibuffer-p
!                           (frame-selected-window menu-updating-frame)))
              :help "Read an existing file into an Emacs buffer"))
  (define-key menu-bar-file-menu [new-file]
    '(menu-item "Visit New File..." find-file
!             :enable (not (window-minibuffer-p
!                           (frame-selected-window menu-updating-frame)))
              :help "Read or create a file and edit it"))
  
  
--- 201,228 ----
              :help "Discard (kill) current buffer"))
  (define-key menu-bar-file-menu [insert-file]
    '(menu-item "Insert File..." insert-file
!             :enable (or (not (display-multi-frame-p))
!                         (and (not (window-minibuffer-p
!                                    (frame-selected-window
!                                     menu-updating-frame)))))
              :help "Insert another file into current buffer"))
  (define-key menu-bar-file-menu [dired]
    '(menu-item "Open Directory..." dired
!             :enable (or (not (display-multi-frame-p))
!                         (not (window-minibuffer-p
!                               (frame-selected-window menu-updating-frame))))
              :help "Read a directory, operate on its files"))
  (define-key menu-bar-file-menu [open-file]
    '(menu-item "Open File..." find-file-existing
!             :enable (or (not (display-multi-frame-p))
!                         (not (window-minibuffer-p
!                               (frame-selected-window menu-updating-frame))))
              :help "Read an existing file into an Emacs buffer"))
  (define-key menu-bar-file-menu [new-file]
    '(menu-item "Visit New File..." find-file
!             :enable (or (not (display-multi-frame-p))
!                         (not (window-minibuffer-p
!                               (frame-selected-window menu-updating-frame))))
              :help "Read or create a file and edit it"))
  
  
***************
*** 1043,1050 ****
              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]
    '("--"))
--- 1057,1065 ----
              toggle-truncate-lines
              :help "Truncate long lines on the screen"
              :button (:toggle . truncate-lines)
!             :enable (or (not (display-multi-frame-p))
!                         (and (frame-live-p menu-updating-frame)
!                              (frame-visible-p menu-updating-frame)))))
  
  (define-key menu-bar-options-menu [highlight-separator]
    '("--"))