Index: lisp/emacs-lisp/easymenu.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emacs-lisp/easymenu.el,v
retrieving revision 1.72
diff -u -r1.72 easymenu.el
--- lisp/emacs-lisp/easymenu.el	23 Apr 2005 16:38:03 -0000	1.72
+++ lisp/emacs-lisp/easymenu.el	13 May 2005 13:53:03 -0000
@@ -65,7 +65,7 @@
    :visible INCLUDE
 
 INCLUDE is an expression; this menu is only visible if this
-expression has a non-nil value.  `:include' is an alias for `:visible'.
+expression has a non-nil value.  `:included' is an alias for `:visible'.
 
    :active ENABLE
 
@@ -110,10 +110,10 @@
 ENABLE is an expression; the item is enabled for selection
 whenever this expression's value is non-nil.
 
-   :included INCLUDE
+   :visible INCLUDE
 
 INCLUDE is an expression; this item is only visible if this
-expression has a non-nil value.
+expression has a non-nil value.  `:included' is an alias for `:visible'.
 
    :suffix FORM
 
Index: lisp/tmm.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/tmm.el,v
retrieving revision 1.39
diff -u -r1.39 tmm.el
--- lisp/tmm.el	1 Sep 2003 15:45:17 -0000	1.39
+++ lisp/tmm.el	13 May 2005 13:53:03 -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
Index: lisp/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.7499
diff -u -r1.7499 ChangeLog
--- lisp/ChangeLog	13 May 2005 08:52:08 -0000	1.7499
+++ lisp/ChangeLog	13 May 2005 13:53:05 -0000
@@ -1,3 +1,10 @@
+2005-05-13  Matt Hodges  <address@hidden>
+
+	* tmm.el (tmm-get-keymap): Include only active menus and menu
+	items.
+
+	* emacs-lisp/easymenu.el (easy-menu-define): Doc fixes.
+
 2005-05-13  YAMAMOTO Mitsuharu  <address@hidden>
 
 	* term/mac-win.el (mac-select-convert-to-string): Try coding