Mercurial > emacs
changeset 57497:0a4c356f307b
(Fsubstitute_command_keys): Fix remap-handling.
Don't ignore menus, because where-is-internal already does it for us.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 15 Oct 2004 14:49:30 +0000 |
| parents | ad0659a2d52e |
| children | 0308942676c7 |
| files | src/ChangeLog src/doc.c |
| diffstat | 2 files changed, 8 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Oct 15 12:02:27 2004 +0000 +++ b/src/ChangeLog Fri Oct 15 14:49:30 2004 +0000 @@ -1,3 +1,8 @@ +2004-10-15 Stefan <monnier@iro.umontreal.ca> + + * doc.c (Fsubstitute_command_keys): Fix remap-handling. + Don't ignore menus, because where-is-internal already does it for us. + 2004-10-15 Kim F. Storm <storm@cua.dk> * xdisp.c (redisplay_window): Only update fringes and vertical
--- a/src/doc.c Fri Oct 15 12:02:27 2004 +0000 +++ b/src/doc.c Fri Oct 15 14:49:30 2004 +0000 @@ -774,28 +774,18 @@ /* Save STRP in IDX. */ idx = strp - SDATA (string); - tem = Fintern (make_string (start, length_byte), Qnil); + name = Fintern (make_string (start, length_byte), Qnil); /* Ignore remappings unless there are no ordinary bindings. */ - tem = Fwhere_is_internal (tem, keymap, Qt, Qnil, Qt); + tem = Fwhere_is_internal (name, keymap, Qt, Qnil, Qt); if (NILP (tem)) - tem = Fwhere_is_internal (tem, keymap, Qt, Qnil, Qnil); + tem = Fwhere_is_internal (name, keymap, Qt, Qnil, Qnil); /* Note the Fwhere_is_internal can GC, so we have to take relocation of string contents into account. */ strp = SDATA (string) + idx; start = SDATA (string) + start_idx; - /* Disregard menu bar bindings; it is positively annoying to - mention them when there's no menu bar, and it isn't terribly - useful even when there is a menu bar. */ - if (!NILP (tem)) - { - firstkey = Faref (tem, make_number (0)); - if (EQ (firstkey, Qmenu_bar)) - tem = Qnil; - } - if (NILP (tem)) /* but not on any keys */ { int offset = bufp - buf;