summaryrefslogtreecommitdiff
path: root/lisp/tmm.el
diff options
context:
space:
mode:
authorNick Roberts <nickrob@snap.net.nz>2005-05-13 23:23:42 +0000
committerNick Roberts <nickrob@snap.net.nz>2005-05-13 23:23:42 +0000
commit7ae862e279b45d58518bf910e979a3c1f0cb2683 (patch)
tree2589359100019e50b575dfe766ba1b713a2fca1a /lisp/tmm.el
parentf964fa513ccfe7b943d8cfc5bbf73b802d4eebd6 (diff)
downloademacs-7ae862e279b45d58518bf910e979a3c1f0cb2683.tar.gz
(tmm-get-keymap): Include only active menus and menu items.
Diffstat (limited to 'lisp/tmm.el')
-rw-r--r--lisp/tmm.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/tmm.el b/lisp/tmm.el
index 99931867792..3e0a8e95701 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -395,7 +395,7 @@ element of keymap, an `x-popup-menu' argument, or an element of
`x-popup-menu' argument (when IN-X-MENU is not-nil).
This function adds the element only if it is not already present.
It uses the free variable `tmm-table-undef' to keep undefined keys."
- (let (km str cache plist filter visible (event (car elt)))
+ (let (km str cache plist filter visible enable (event (car elt)))
(setq elt (cdr elt))
(if (eq elt 'undefined)
(setq tmm-table-undef (cons (cons event nil) tmm-table-undef))
@@ -436,6 +436,9 @@ It uses the free variable `tmm-table-undef' to keep undefined keys."
(setq visible (plist-get plist :visible))
(if visible
(setq km (and (eval visible) km)))
+ (setq enable (plist-get plist :enable))
+ (if enable
+ (setq km (and (eval enable) km)))
(and str
(consp (nth 3 elt))
(stringp (cdr (nth 3 elt))) ; keyseq cache