Mercurial > emacs
changeset 57441:4c881805ff35
(Fsubstitute_command_keys): Ignore remappings unless there
are no ordinary bindings.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Mon, 11 Oct 2004 22:36:35 +0000 |
| parents | c73d8ac83f10 |
| children | 2d9a1d1ac73d |
| files | src/doc.c |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/doc.c Mon Oct 11 22:36:16 2004 +0000 +++ b/src/doc.c Mon Oct 11 22:36:35 2004 +0000 @@ -776,9 +776,13 @@ idx = strp - SDATA (string); tem = Fintern (make_string (start, length_byte), Qnil); + /* Ignore remappings unless there are no ordinary bindings. */ + tem = Fwhere_is_internal (tem, keymap, Qt, Qnil, Qt); + if (NILP (tem)) + tem = Fwhere_is_internal (tem, keymap, Qt, Qnil, Qnil); + /* Note the Fwhere_is_internal can GC, so we have to take relocation of string contents into account. */ - tem = Fwhere_is_internal (tem, keymap, Qt, Qnil, Qnil); strp = SDATA (string) + idx; start = SDATA (string) + start_idx;