aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman <[email protected]>1994-06-07 18:31:56 +0000
committerRichard M. Stallman <[email protected]>1994-06-07 18:31:56 +0000
commitcc1032b3f376281e724c2f2903a6e5f23ec42db7 (patch)
tree2bc7ac66f350bd7d883647cc5bcdd1e42bc6393a
parent6ee37df2e65931026cb3c46b9359ab79d8027dc1 (diff)
(menu_item_equiv_key): Check whether def1 matches
un-aliased command name as well as given command name.
-rw-r--r--src/xmenu.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index a00bcb1a78..3a0e2137cb 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -324,6 +324,11 @@ menu_item_equiv_key (item_string, item1, descrip_ptr)
def1 = Fkey_binding (savedkey, Qnil);
/* If not, update it. */
if (! EQ (def1, def)
+ /* If the command is an alias for another
+ (such as easymenu.el and lmenu.el set it up),
+ check if the original command matches the cached command. */
+ && !(SYMBOLP (def) && SYMBOLP (XSYMBOL (def)->function)
+ && EQ (def1, XSYMBOL (def)->function))
/* If something had no key binding before, don't recheck it--
doing that takes too much time and makes menus too slow. */
&& !(!NILP (cachelist) && NILP (savedkey)))