* keymap.c (where_is_internal_data): Make noindirect a boolean.

(where_is_internal): Strip it down to only traverse the keymaps.
Move the cache handling from Fwhere_is_internal to here.
(Fwhere_is_internal): Move the handling of remapping and the choice of
the best binding from where_is_internal to here.
Unify the cached/noncached paths, so remapping is also handled
correctly when the cache is used, and so the cache can be used to
speed up remap-handling when applicable.
Give preference to non-remapped bindings.
* doc.c (Fsubstitute_command_keys): Let Fwhere_is_internal's prefer
non-remapped bindings.
* keyboard.c (parse_menu_item): Let Fwhere_is_internal handle
command remapping.

1 files changed, 1 insertions, 5 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index dfb625675a4..04af3585897 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -8158,11 +8158,7 @@ parse_menu_item (item, notreal, inmenubar)
               && SYMBOLP (XSYMBOL (def)->function)
               && ! NILP (Fget (def, Qmenu_alias)))
             def = XSYMBOL (def)->function;
-          tem = Fwhere_is_internal (def, Qnil, Qt, Qnil, Qt);
-
-          /* Don't display remap bindings.*/
-          if (VECTORP (tem) && ASIZE (tem) > 0 && EQ (AREF (tem, 0), Qremap))
-            tem = Qnil;
+          tem = Fwhere_is_internal (def, Qnil, Qt, Qnil, Qnil);
 
           XSETCAR (cachelist, tem);
           if (NILP (tem))