(menu_item_equiv_key): Look for equiv keys both before

and after one stage of symbol function indirection.

1 files changed, 7 insertions, 0 deletions

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;