aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Kastrup2005-05-20 15:30:59 +0000
committerDavid Kastrup2005-05-20 15:30:59 +0000
commit8292be61c58c9eed64f132ccd688f889fa389230 (patch)
tree02facaf66f09734912a01435c46a767c2343da92
parent47bc4b3fe18e5cdbcd268699ad0cc5183cd33373 (diff)
downloademacs-8292be61c58c9eed64f132ccd688f889fa389230.tar.gz
emacs-8292be61c58c9eed64f132ccd688f889fa389230.zip
(easy-menu-add): Correct docstring since
easy-menu-add is not a nop on Emacs; and clarify when to call it.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/easymenu.el14
2 files changed, 14 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f35eec9e1f0..00f41a56f10 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12005-05-20 David Kastrup <dak@gnu.org>
2
3 * emacs-lisp/easymenu.el (easy-menu-add): Correct docstring since
4 easy-menu-add is not a nop on Emacs; and clarify when to call it.
5
12005-05-20 Carsten Dominik <dominik@science.uva.nl> 62005-05-20 Carsten Dominik <dominik@science.uva.nl>
2 7
3 * textmodes/org.el (org-agenda-toggle-time-grid): New command. 8 * textmodes/org.el (org-agenda-toggle-time-grid): New command.
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index c9f1769ae14..b3160c9b752 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -471,11 +471,15 @@ Contrary to XEmacs, this is a nop on Emacs since menus are automatically
471 471
472(defun easy-menu-add (menu &optional map) 472(defun easy-menu-add (menu &optional map)
473 "Add the menu to the menubar. 473 "Add the menu to the menubar.
474This is a nop on Emacs since menus are automatically activated when the 474On Emacs, menus are already automatically activated when the
475corresponding keymap is activated. On XEmacs this is needed to actually 475corresponding keymap is activated. On XEmacs this is needed to
476add the menu to the current menubar. 476actually add the menu to the current menubar.
477Maybe precalculate equivalent key bindings. 477
478Do it only if `easy-menu-precalculate-equivalent-keybindings' is on." 478This also precalculates equivalent key bindings when
479`easy-menu-precalculate-equivalent-keybindings' is on.
480
481You should call this once the menu and keybindings are set up
482completely and menu filter functions can be expected to work."
479 (when easy-menu-precalculate-equivalent-keybindings 483 (when easy-menu-precalculate-equivalent-keybindings
480 (if (and (symbolp menu) (not (keymapp menu)) (boundp menu)) 484 (if (and (symbolp menu) (not (keymapp menu)) (boundp menu))
481 (setq menu (symbol-value menu))) 485 (setq menu (symbol-value menu)))