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

[David Kastrup]

Index: emacs/lisp/emacs-lisp/easymenu.el
diff -c emacs/lisp/emacs-lisp/easymenu.el:1.73 
emacs/lisp/emacs-lisp/easymenu.el:1.74
*** emacs/lisp/emacs-lisp/easymenu.el:1.73      Fri May 13 23:22:42 2005
--- emacs/lisp/emacs-lisp/easymenu.el   Fri May 20 15:30:58 2005
***************
*** 471,481 ****
  
  (defun easy-menu-add (menu &optional map)
    "Add the menu to the menubar.
! This is a nop on Emacs since menus are automatically activated when the
! corresponding keymap is activated.  On XEmacs this is needed to actually
! add the menu to the current menubar.
! Maybe precalculate equivalent key bindings.
! Do it only if `easy-menu-precalculate-equivalent-keybindings' is on."
    (when easy-menu-precalculate-equivalent-keybindings
      (if (and (symbolp menu) (not (keymapp menu)) (boundp menu))
        (setq menu (symbol-value menu)))
--- 471,485 ----
  
  (defun easy-menu-add (menu &optional map)
    "Add the menu to the menubar.
! On Emacs, menus are already automatically activated when the
! corresponding keymap is activated.  On XEmacs this is needed to
! actually add the menu to the current menubar.
! 
! This also precalculates equivalent key bindings when
! `easy-menu-precalculate-equivalent-keybindings' is on.
! 
! You should call this once the menu and keybindings are set up
! completely and menu filter functions can be expected to work."
    (when easy-menu-precalculate-equivalent-keybindings
      (if (and (symbolp menu) (not (keymapp menu)) (boundp menu))
        (setq menu (symbol-value menu)))