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

Merge from emacs--cvs-trunk--0

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-49
   Add {arch}/=commit-merge-make-log

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-50
   {arch}/=commit-merge-make-log: Don't die if there are no ChangeLog changes

1 files changed, 5 insertions, 1 deletions

diff --git a/src/doc.c b/src/doc.c
index 8c116210cda..9a787e002d8 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -776,9 +776,13 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int
           idx = strp - SDATA (string);
           tem = Fintern (make_string (start, length_byte), Qnil);
 
+          /* Ignore remappings unless there are no ordinary bindings. */
+          tem = Fwhere_is_internal (tem, keymap, Qt, Qnil, Qt);
+          if (NILP (tem))
+            tem = Fwhere_is_internal (tem, keymap, Qt, Qnil, Qnil);
+
           /* Note the Fwhere_is_internal can GC, so we have to take
              relocation of string contents into account.  */
-          tem = Fwhere_is_internal (tem, keymap, Qt, Qnil, Qnil);
           strp = SDATA (string) + idx;
           start = SDATA (string) + start_idx;