(menu_item_equiv_key): If command is an alias,

check only the underlying command for a keyboard equivalent.

diff --git a/src/xmenu.c b/src/xmenu.c
index 17d665ebc2726b43cec773d9f274a00fe1a3590f..c2a37a8d93b14263393c5da81ce9d9fa666493f2 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -344,13 +344,17 @@ menu_item_equiv_key (item_string, item1, descrip_ptr)
     {
       changed = 1;
       descrip = Qnil;
-      savedkey = Fwhere_is_internal (def, Qnil, Qt, Qnil);
       /* If the command is an alias for another
         (such as easymenu.el and lmenu.el set it up),
         see if the original command name has equivalent keys.  */
       if (SYMBOLP (def) && SYMBOLP (XSYMBOL (def)->function))
        savedkey = Fwhere_is_internal (XSYMBOL (def)->function,
                                       Qnil, Qt, Qnil);
+      else
+       /* Otherwise look up the specified command itself.
+          We don't try both, because that makes easymenu menus slow.  */
+       savedkey = Fwhere_is_internal (def, Qnil, Qt, Qnil);
+
 
       if (VECTORP (savedkey)
          && EQ (XVECTOR (savedkey)->contents[0], Qmenu_bar))