# HG changeset patch
# User Nick Roberts <nickrob@snap.net.nz>
# Date 1116026622 0
# Node ID 587868b19cb8a9512ebbaaaa89a9b597136ae71f
# Parent  2acfd9cf6713c34688709f5432dbc9612c52898f
(tmm-get-keymap): Include only active menus and menu items.

diff -r 2acfd9cf6713 -r 587868b19cb8 lisp/tmm.el
--- a/lisp/tmm.el	Fri May 13 23:22:42 2005 +0000
+++ b/lisp/tmm.el	Fri May 13 23:23:42 2005 +0000
@@ -395,7 +395,7 @@
 `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 @@
 	       (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