From 10bba2660f47b72a1afdced9a50cbd1217089c6d Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Wed, 25 May 1994 09:20:10 +0000 Subject: [PATCH] (menu_item_equiv_key): Look for equiv keys both before and after one stage of symbol function indirection. --- src/xmenu.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/xmenu.c b/src/xmenu.c index 056ae04dd41..ba92c90787f 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -331,6 +331,13 @@ 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); + if (VECTORP (savedkey) && EQ (XVECTOR (savedkey)->contents[0], Qmenu_bar)) savedkey = Qnil; -- 2.39.5