*** empty log message ***

1 files changed, 27 insertions, 26 deletions

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index dc8f80785c1..a0b1e5d71b1 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -8,43 +8,43 @@
 (setq menu-bar-help-menu (make-sparse-keymap "Help"))
 (define-key global-map [menu-bar help] menu-bar-help-menu)
 
-(define-key menu-bar-file-map [new-frame] '("New Frame" . new-frame))
-(define-key menu-bar-file-map [open-file] '("Open File..." . find-file))
-(define-key menu-bar-file-map [save-buffer] '("Save Buffer" . save-buffer))
-(define-key menu-bar-file-map [write-file]
+(define-key menu-bar-file-menu [new-frame] '("New Frame" . new-frame))
+(define-key menu-bar-file-menu [open-file] '("Open File..." . find-file))
+(define-key menu-bar-file-menu [save-buffer] '("Save Buffer" . save-buffer))
+(define-key menu-bar-file-menu [write-file]
   '("Save Buffer As..." . write-file))
-(define-key menu-bar-file-map [revert-buffer]
+(define-key menu-bar-file-menu [revert-buffer]
   '("Revert Buffer" . revert-buffer))
-(define-key menu-bar-file-map [print-buffer] '("Print Buffer" . print-buffer))
-(define-key menu-bar-file-map [delete-frame] '("Delete Frame" . delete-frame))
-(define-key menu-bar-file-map [kill-buffer]
+(define-key menu-bar-file-menu [print-buffer] '("Print Buffer" . print-buffer))
+(define-key menu-bar-file-menu [delete-frame] '("Delete Frame" . delete-frame))
+(define-key menu-bar-file-menu [kill-buffer]
   '("Kill Buffer" . kill-this-buffer))
-(define-key menu-bar-file-map [exit-emacs]
+(define-key menu-bar-file-menu [exit-emacs]
   '("Exit Emacs" . save-buffers-kill-emacs))
 
-(define-key menu-bar-edit-map [undo] '("Undo" . advertised-undo))
-(define-key menu-bar-edit-map [cut] '("Cut" . x-kill-primary-selection))
-(define-key menu-bar-edit-map [copy] '("Copy" . x-copy-primary-selection))
-(define-key menu-bar-edit-map [paste] '("Paste" . x-yank-clipboard-selection))
-(define-key menu-bar-edit-map [clear] '("Clear" . x-delete-primary-selection))
+(define-key menu-bar-edit-menu [undo] '("Undo" . advertised-undo))
+(define-key menu-bar-edit-menu [cut] '("Cut" . x-kill-primary-selection))
+(define-key menu-bar-edit-menu [copy] '("Copy" . x-copy-primary-selection))
+(define-key menu-bar-edit-menu [paste] '("Paste" . x-yank-clipboard-selection))
+(define-key menu-bar-edit-menu [clear] '("Clear" . x-delete-primary-selection))
 
-(define-key menu-bar-help-map [info] '("Info" . info))
-(define-key menu-bar-help-map [describe-mode]
+(define-key menu-bar-help-menu [info] '("Info" . info))
+(define-key menu-bar-help-menu [describe-mode]
   '("Describe Mode" . describe-mode))
-(define-key menu-bar-help-map [command-apropos]
+(define-key menu-bar-help-menu [command-apropos]
   '("Command Apropos..." . command-apropos))
-(define-key menu-bar-help-map [list-keybindings]
+(define-key menu-bar-help-menu [list-keybindings]
   '("List Keybindings" . describe-bindings))
-(define-key menu-bar-help-map [describe-key]
+(define-key menu-bar-help-menu [describe-key]
   '("Describe Key..." . describe-key))
-(define-key menu-bar-help-map [describe-function]
+(define-key menu-bar-help-menu [describe-function]
   '("Describe Function..." . describe-function))
-(define-key menu-bar-help-map [describe-variable]
+(define-key menu-bar-help-menu [describe-variable]
   '("Describe Variable..." . describe-variable))
-(define-key menu-bar-help-map [man] '("Man..." . manual-entry))
-(define-key menu-bar-help-map [emacs-tutorial]
+(define-key menu-bar-help-menu [man] '("Man..." . manual-entry))
+(define-key menu-bar-help-menu [emacs-tutorial]
   '("Emacs Tutorial" . help-with-tutorial))
-(define-key menu-bar-help-map [emacs-news] '("Emacs News" . view-emacs-news))
+(define-key menu-bar-help-menu [emacs-news] '("Emacs News" . view-emacs-news))
 
 
 (defun kill-this-buffer ()      ; for the menubar
@@ -54,7 +54,7 @@
 
 (put 'save-buffer 'menu-enable '(buffer-modified-p))
 (put 'revert-buffer 'menu-enable 'buffer-file-name)
-(put 'delete-frame 'menu-enable '(null (cdr (visible-frame-list)))))
+(put 'delete-frame 'menu-enable '(null (cdr (visible-frame-list))))
 (put 'x-kill-primary-selection 'menu-enable '(x-selection-owner-p))
 (put 'x-copy-primary-selection 'menu-enable '(x-selection-owner-p))
 (put 'x-yank-clipboard-selection 'menu-enable '(x-selection-owner-p))
@@ -66,4 +66,5 @@
                (setq undoing-more
                      (and (boundp 'pending-undo-list)
                           pending-undo-list)
-                     buffer-undo-list))))
\ No newline at end of file
+                     buffer-undo-list))))
+(force-mode-line-update)