(Fsubstitute_command_keys): Fix remap-handling.

Don't ignore menus, because where-is-internal already does it for us.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5f65b02a90842a0ec0e0bc7b439e21905fb831b4..e92e6b96eec73163c887e5f56ad17bf89b5771a3 100644 (file)
--- 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 e6914d2403881cc5a9213fe204789cd24e3a8898..82df9134f61197ed0f7855826506ec9f79bc075d 100644 (file)
--- 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;