aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/xmenu.c6
1 files changed, 5 insertions, 1 deletions
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)
344 { 344 {
345 changed = 1; 345 changed = 1;
346 descrip = Qnil; 346 descrip = Qnil;
347 savedkey = Fwhere_is_internal (def, Qnil, Qt, Qnil);
348 /* If the command is an alias for another 347 /* If the command is an alias for another
349 (such as easymenu.el and lmenu.el set it up), 348 (such as easymenu.el and lmenu.el set it up),
350 see if the original command name has equivalent keys. */ 349 see if the original command name has equivalent keys. */
351 if (SYMBOLP (def) && SYMBOLP (XSYMBOL (def)->function)) 350 if (SYMBOLP (def) && SYMBOLP (XSYMBOL (def)->function))
352 savedkey = Fwhere_is_internal (XSYMBOL (def)->function, 351 savedkey = Fwhere_is_internal (XSYMBOL (def)->function,
353 Qnil, Qt, Qnil); 352 Qnil, Qt, Qnil);
353 else
354 /* Otherwise look up the specified command itself.
355 We don't try both, because that makes easymenu menus slow. */
356 savedkey = Fwhere_is_internal (def, Qnil, Qt, Qnil);
357
354 358
355 if (VECTORP (savedkey) 359 if (VECTORP (savedkey)
356 && EQ (XVECTOR (savedkey)->contents[0], Qmenu_bar)) 360 && EQ (XVECTOR (savedkey)->contents[0], Qmenu_bar))