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

[Richard M . Stallman]

Index: emacs/lisp/menu-bar.el
diff -c emacs/lisp/menu-bar.el:1.263 emacs/lisp/menu-bar.el:1.264
*** emacs/lisp/menu-bar.el:1.263        Sat Aug  6 22:13:43 2005
--- emacs/lisp/menu-bar.el      Tue Aug  9 11:28:26 2005
***************
*** 99,111 ****
              :help "Open a new frame"))
  
  (define-key menu-bar-file-menu [one-window]
!   '(menu-item "Unsplit Windows" delete-other-windows
              :enable (not (one-window-p t nil))
!             :help "Make selected window fill its frame"))
  
  (define-key menu-bar-file-menu [split-window]
    '(menu-item "Split Window" split-window-vertically
!             :help "Split selected window in two"))
  
  (define-key menu-bar-file-menu [separator-window]
    '(menu-item "--"))
--- 99,111 ----
              :help "Open a new frame"))
  
  (define-key menu-bar-file-menu [one-window]
!   '(menu-item "Remove Splits" delete-other-windows
              :enable (not (one-window-p t nil))
!             :help "Selected window grows to fill the whole frame"))
  
  (define-key menu-bar-file-menu [split-window]
    '(menu-item "Split Window" split-window-vertically
!             :help "Split selected window in two windows"))
  
  (define-key menu-bar-file-menu [separator-window]
    '(menu-item "--"))
***************
*** 159,170 ****
                                         (current-buffer))))))
              :help "Re-read current buffer from its file"))
  (define-key menu-bar-file-menu [write-file]
!   '(menu-item "Save Buffer 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 (current buffer)" save-buffer
              :enable (and (buffer-modified-p)
                           (buffer-file-name)
                           (not (window-minibuffer-p
--- 159,170 ----
                                         (current-buffer))))))
              :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
              :enable (and (buffer-modified-p)
                           (buffer-file-name)
                           (not (window-minibuffer-p
***************
*** 175,183 ****
    '(menu-item "--"))
  
  (define-key menu-bar-file-menu [kill-buffer]
!   '(menu-item "Close (current buffer)" kill-this-buffer
              :enable (kill-this-buffer-enabled-p)
!             :help "Discard current buffer"))
  (define-key menu-bar-file-menu [insert-file]
    '(menu-item "Insert File..." insert-file
              :enable (not (window-minibuffer-p
--- 175,183 ----
    '(menu-item "--"))
  
  (define-key menu-bar-file-menu [kill-buffer]
!   '(menu-item "Close" kill-this-buffer
              :enable (kill-this-buffer-enabled-p)
!             :help "Discard (kill) current buffer"))
  (define-key menu-bar-file-menu [insert-file]
    '(menu-item "Insert File..." insert-file
              :enable (not (window-minibuffer-p
***************
*** 194,200 ****
                            (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 "New File..." find-file
              :enable (not (window-minibuffer-p
                            (frame-selected-window menu-updating-frame)))
              :help "Read or create a file and edit it"))
--- 194,200 ----
                            (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"))