From 86e00a8a096d66c0825597998e671d27fc345467 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 12 Feb 1995 01:22:28 +0000 Subject: [PATCH] (menu_item_equiv_key): If command is an alias, check only the underlying command for a keyboard equivalent. --- src/xmenu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/xmenu.c b/src/xmenu.c index 17d665ebc27..c2a37a8d93b 100644 --- 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)) -- 2.39.5