1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-04 08:47:11 +00:00

(Fsubstitute_command_keys): Ignore remappings unless there

are no ordinary bindings.
This commit is contained in:
Kim F. Storm 2004-10-11 22:36:35 +00:00
parent b583964c15
commit 332e51c15c

View File

@ -776,9 +776,13 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int
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;