Merged from miles@gnu.org--gnu-2005 (patch 74-79, 332-349)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-332
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-333
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-334
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-335
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-336
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-337
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-338
   etc/emacs-buffer.gdb: Remove RCS keywords

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-339
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-340
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-341
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-342
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-343
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-344
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-345
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-346
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-347
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-348
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-349
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-74
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-75
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-76
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-77
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-78
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-79
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-349

1 files changed, 11 insertions, 3 deletions

diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index b3160c9b752..982570fb348 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -1,6 +1,7 @@
 ;;; easymenu.el --- support the easymenu interface for defining a menu
 
-;; Copyright (C) 1994,96,98,1999,2000,2004  Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1996, 1998, 1999, 2000, 2004, 2005
+;;           Free Software Foundation, Inc.
 
 ;; Keywords: emulations
 ;; Author: Richard Stallman <rms@gnu.org>
@@ -534,7 +535,7 @@ earlier by `easy-menu-define' or `easy-menu-create-menu'."
     (easy-menu-do-add-item map item before)))
 
 (defun easy-menu-item-present-p (map path name)
-  "In submenu of MAP with path PATH, return true iff item NAME is present.
+  "In submenu of MAP with path PATH, return non-nil iff item NAME is present.
 MAP and PATH are defined as in `easy-menu-add-item'.
 NAME should be a string, the name of the element to be looked for."
   (easy-menu-return-item (easy-menu-get-map map path) name))
@@ -552,7 +553,14 @@ NAME should be a string, the name of the element to be removed."
   "In menu MENU try to look for menu item with name NAME.
 If a menu item is found, return (NAME . item), otherwise return nil.
 If item is an old format item, a new format item is returned."
-  (let ((item (lookup-key menu (vector (easy-menu-intern name))))
+  ;; The call to `lookup-key' also calls the C function `get_keyelt' which
+  ;; looks inside a menu-item to only return the actual command.  This is
+  ;; not what we want here.  We should either add an arg to lookup-key to be
+  ;; able to turn off this "feature", or else we could use map-keymap here.
+  ;; In the mean time, I just use `assq' which is an OK approximation since
+  ;; menus are rarely built from vectors or char-tables.
+  (let ((item (or (cdr (assq name menu))
+                  (lookup-key menu (vector (easy-menu-intern name)))))
 	ret enable cache label)
     (cond
      ((stringp (car-safe item))