diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-10-15 14:49:30 +0000 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-10-15 14:49:30 +0000 |
commit | 4988592b8f5b70b1d51bb10ba9a4f7a2dd754ef0 (patch) | |
tree | 9ebcb53b65a2beec9fa58c703847b5f9f33ecd9e | |
parent | ca15a5490e4ded09e998c3d357a44e2d3c7e120f (diff) | |
download | emacs-4988592b8f5b70b1d51bb10ba9a4f7a2dd754ef0.tar.gz |
(Fsubstitute_command_keys): Fix remap-handling.
Don't ignore menus, because where-is-internal already does it for us.
-rw-r--r-- | src/ChangeLog | 5 | ||||
-rw-r--r-- | src/doc.c | 16 |
2 files changed, 8 insertions, 13 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9091ff2198d..81faef9160f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 diff --git a/src/doc.c b/src/doc.c index e6914d24038..82df9134f61 100644 --- a/src/doc.c +++ b/src/doc.c @@ -774,28 +774,18 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int /* 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; |