Merged from miles@gnu.org--gnu-2005 (patch 14-16, 95-106)

Patches applied:

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-96
   Move Gnus images into etc/images

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

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

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-15
   Update from CVS: lisp/imap.el (imap-log): Doc fix.

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

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-295

1 files changed, 10 insertions, 1 deletions

diff --git a/src/doc.c b/src/doc.c
index f306caed36a..0d1ab394647 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -882,6 +882,9 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int
         {
           struct buffer *oldbuf;
           int start_idx;
+          /* This is for computing the SHADOWS arg for describe_map_tree.  */
+          Lisp_Object active_maps = Fcurrent_active_maps (Qnil);
+          Lisp_Object earlier_maps;
 
           changed = 1;
           strp += 2;            /* skip \{ or \< */
@@ -932,7 +935,13 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int
           else if (start[-1] == '<')
             keymap = tem;
           else
-            describe_map_tree (tem, 1, Qnil, Qnil, (char *)0, 1, 0, 0);
+            {
+              /* Get the list of active keymaps that precede this one.
+                 If this one's not active, get nil.  */
+              earlier_maps = Fcdr (Fmemq (tem, Freverse (active_maps)));
+              describe_map_tree (tem, 1, Fnreverse (earlier_maps),
+                                 Qnil, (char *)0, 1, 0, 0, 1);
+            }
           tem = Fbuffer_string ();
           Ferase_buffer ();
           set_buffer_internal (oldbuf);