[Emacs-diffs] Changes to emacs/src/doc.c

[Richard M . Stallman]

Index: emacs/src/doc.c
diff -c emacs/src/doc.c:1.110 emacs/src/doc.c:1.111
*** emacs/src/doc.c:1.110       Tue Nov  9 13:23:00 2004
--- emacs/src/doc.c     Tue Feb 15 06:36:17 2005
***************
*** 882,887 ****
--- 882,890 ----
        {
          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,938 ****
          else if (start[-1] == '<')
            keymap = tem;
          else
!           describe_map_tree (tem, 1, Qnil, Qnil, (char *)0, 1, 0, 0);
          tem = Fbuffer_string ();
          Ferase_buffer ();
          set_buffer_internal (oldbuf);
--- 935,947 ----
          else if (start[-1] == '<')
            keymap = tem;
          else
!           {
!             /* 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);