* 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, 14 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 09967b68d3f..c530325ed69 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,19 @@
 2009-09-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * 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.
+
         * xdisp.c (display_mode_element): Move list length limit from 50 to
         5000 (see thread starting with <xbaik5174uqu.fsf@cam.ac.uk>).