diff options
author | Richard M. Stallman <rms@gnu.org> | 1994-05-28 21:54:36 +0000 |
---|---|---|
committer | Richard M. Stallman <rms@gnu.org> | 1994-05-28 21:54:36 +0000 |
commit | e24cb6c5c4ecfcbc65d21ade319304bd46b51f16 (patch) | |
tree | 7143e39d7319a243426e78d4a32c250fab21579e /lisp | |
parent | 16776e8d91859cccebe3421528bf0c78bd78bc43 (diff) | |
download | emacs-e24cb6c5c4ecfcbc65d21ade319304bd46b51f16.tar.gz emacs-e24cb6c5c4ecfcbc65d21ade319304bd46b51f16.tar.bz2 emacs-e24cb6c5c4ecfcbc65d21ade319304bd46b51f16.zip |
(make-lucid-menu-keymap): Allow any form as the enabler.
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/emacs-lisp/lmenu.el | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/lmenu.el b/lisp/emacs-lisp/lmenu.el index 44e176e1ffd..ee9417d01be 100644 --- a/lisp/emacs-lisp/lmenu.el +++ b/lisp/emacs-lisp/lmenu.el @@ -62,7 +62,7 @@ (while menu-items (let* ((item (car menu-items)) (callback (if (vectorp item) (aref item 1))) - command enabler name) + command name) (cond ((stringp item) (setq command nil) (setq name (if (string-match "^-+$" item) "" item))) @@ -72,11 +72,8 @@ ((vectorp item) (setq command (make-symbol (format "menu-function-%d" add-menu-item-count))) - (setq enabler (make-symbol (format "menu-function-%d-enabler" - add-menu-item-count))) (setq add-menu-item-count (1+ add-menu-item-count)) - (put command 'menu-enable enabler) - (set enabler (aref item 2)) + (put command 'menu-enable (aref item 2)) (setq name (aref item 0)) (if (symbolp callback) (fset command callback) @@ -421,7 +418,7 @@ MENU-ITEMS is a list of menu item descriptions. Each menu item should be a vector of three elements: - a string, the name of the menu item; - a symbol naming a command, or a form to evaluate; - - and t or nil, whether this item is selectable. + - and a form whose value determines whether this item is selectable. BEFORE, if provided, is the name of a menu before which this menu should be added, if this menu is not on its parent already. If the menu is already present, it will not be moved." |