Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-62

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-616
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-620
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-621
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-622
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-625
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-626
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-627
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-628
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-629
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-630
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-631
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-632
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-633
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-51
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-52
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-53
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-54
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-55
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-56
   Update from CVS: Add lisp/legacy-gnus-agent.el

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-57
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-58
   Update from CVS

1 files changed, 3 insertions, 13 deletions

diff --git a/src/doc.c b/src/doc.c
index 9a787e002d8..f722dd49b76 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;