diff options
| author | David Kastrup | 2005-05-20 15:30:59 +0000 |
|---|---|---|
| committer | David Kastrup | 2005-05-20 15:30:59 +0000 |
| commit | 8292be61c58c9eed64f132ccd688f889fa389230 (patch) | |
| tree | 02facaf66f09734912a01435c46a767c2343da92 | |
| parent | 47bc4b3fe18e5cdbcd268699ad0cc5183cd33373 (diff) | |
| download | emacs-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/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/easymenu.el | 14 |
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 @@ | |||
| 1 | 2005-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 | |||
| 1 | 2005-05-20 Carsten Dominik <dominik@science.uva.nl> | 6 | 2005-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. |
| 474 | This is a nop on Emacs since menus are automatically activated when the | 474 | On Emacs, menus are already automatically activated when the |
| 475 | corresponding keymap is activated. On XEmacs this is needed to actually | 475 | corresponding keymap is activated. On XEmacs this is needed to |
| 476 | add the menu to the current menubar. | 476 | actually add the menu to the current menubar. |
| 477 | Maybe precalculate equivalent key bindings. | 477 | |
| 478 | Do it only if `easy-menu-precalculate-equivalent-keybindings' is on." | 478 | This also precalculates equivalent key bindings when |
| 479 | `easy-menu-precalculate-equivalent-keybindings' is on. | ||
| 480 | |||
| 481 | You should call this once the menu and keybindings are set up | ||
| 482 | completely 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))) |