# HG changeset patch # User Stefan Monnier # Date 1097851770 0 # Node ID 0a4c356f307b451bed90a5b29ee7bab117e5cc2f # Parent ad0659a2d52e7fc5e9f0438c43f923430156cd79 (Fsubstitute_command_keys): Fix remap-handling. Don't ignore menus, because where-is-internal already does it for us. diff -r ad0659a2d52e -r 0a4c356f307b src/ChangeLog --- 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 + + * 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 * xdisp.c (redisplay_window): Only update fringes and vertical diff -r ad0659a2d52e -r 0a4c356f307b src/doc.c --- 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;