Mercurial > emacs
changeset 76862:4f957abd4298
(where_is_internal): Scan provided keymaps for command remappings
rather than calling Fcommand_remapping.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sun, 01 Apr 2007 15:58:29 +0000 |
| parents | 3f0c06049787 |
| children | a5052885b6cb |
| files | src/keymap.c |
| diffstat | 1 files changed, 16 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/keymap.c Sun Apr 01 15:42:39 2007 +0000 +++ b/src/keymap.c Sun Apr 01 15:58:29 2007 +0000 @@ -2579,15 +2579,6 @@ /* 1 means ignore all menu bindings entirely. */ int nomenus = !NILP (firstonly) && !EQ (firstonly, Qnon_ascii); - /* If this command is remapped, then it has no key bindings - of its own. */ - if (NILP (no_remap) && SYMBOLP (definition)) - { - Lisp_Object tem; - if (tem = Fcommand_remapping (definition, Qnil), !NILP (tem)) - return Qnil; - } - found = keymaps; while (CONSP (found)) { @@ -2601,6 +2592,22 @@ found = Qnil; sequences = Qnil; + /* If this command is remapped, then it has no key bindings + of its own. */ + if (NILP (no_remap) && SYMBOLP (definition)) + { + Lisp_Object kmaps, map, remap; + + for (kmaps = maps; !NILP (kmaps); kmaps = Fcdr (kmaps)) + if (map = Fcdr (Fcar (kmaps)), KEYMAPP (map)) + { + ASET (command_remapping_vector, 1, definition); + remap = Flookup_key (map, command_remapping_vector, Qnil); + if (!NILP (remap) && !INTEGERP (remap)) + RETURN_UNGCPRO (Qnil); + } + } + for (; !NILP (maps); maps = Fcdr (maps)) { /* Key sequence to reach map, and the map that it reaches */