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

[Kim F . Storm]

Index: emacs/src/window.c
diff -c emacs/src/window.c:1.517 emacs/src/window.c:1.518
*** emacs/src/window.c:1.517    Tue Oct  4 14:14:05 2005
--- emacs/src/window.c  Fri Oct  7 22:17:05 2005
***************
*** 6232,6238 ****
   ***********************************************************************/
  
  static Lisp_Object
! window_split_tree (w)
       struct window *w;
  {
    Lisp_Object tail = Qnil;
--- 6232,6238 ----
   ***********************************************************************/
  
  static Lisp_Object
! window_tree (w)
       struct window *w;
  {
    Lisp_Object tail = Qnil;
***************
*** 6245,6254 ****
        XSETWINDOW (wn, w);
        if (!NILP (w->hchild))
        wn = Fcons (Qnil, Fcons (Fwindow_edges (wn),
!                                window_split_tree (XWINDOW (w->hchild))));
        else if (!NILP (w->vchild))
        wn = Fcons (Qt, Fcons (Fwindow_edges (wn),
!                              window_split_tree (XWINDOW (w->vchild))));
  
        if (NILP (result))
        {
--- 6245,6254 ----
        XSETWINDOW (wn, w);
        if (!NILP (w->hchild))
        wn = Fcons (Qnil, Fcons (Fwindow_edges (wn),
!                                window_tree (XWINDOW (w->hchild))));
        else if (!NILP (w->vchild))
        wn = Fcons (Qt, Fcons (Fwindow_edges (wn),
!                              window_tree (XWINDOW (w->vchild))));
  
        if (NILP (result))
        {
***************
*** 6268,6279 ****
  
  
  
! DEFUN ("window-split-tree", Fwindow_split_tree, Swindow_split_tree,
         0, 1, 0,
!        doc: /* Return the window split tree for frame FRAME.
  
  The return value is a list of the form (ROOT MINI), where ROOT
! represents the window split tree of the frame's root window, and MINI
  is the frame's minibuffer window.
  
  If the root window is not split, ROOT is the root window itself.
--- 6268,6279 ----
  
  
  
! DEFUN ("window-tree", Fwindow_tree, Swindow_tree,
         0, 1, 0,
!        doc: /* Return the window tree for frame FRAME.
  
  The return value is a list of the form (ROOT MINI), where ROOT
! represents the window tree of the frame's root window, and MINI
  is the frame's minibuffer window.
  
  If the root window is not split, ROOT is the root window itself.
***************
*** 6301,6307 ****
    if (!FRAME_LIVE_P (f))
      return Qnil;
  
!   return window_split_tree (XWINDOW (FRAME_ROOT_WINDOW (f)));
  }
  
  
--- 6301,6307 ----
    if (!FRAME_LIVE_P (f))
      return Qnil;
  
!   return window_tree (XWINDOW (FRAME_ROOT_WINDOW (f)));
  }
  
  
***************
*** 7110,7116 ****
    defsubr (&Sset_window_configuration);
    defsubr (&Scurrent_window_configuration);
    defsubr (&Ssave_window_excursion);
!   defsubr (&Swindow_split_tree);
    defsubr (&Sset_window_margins);
    defsubr (&Swindow_margins);
    defsubr (&Sset_window_fringes);
--- 7110,7116 ----
    defsubr (&Sset_window_configuration);
    defsubr (&Scurrent_window_configuration);
    defsubr (&Ssave_window_excursion);
!   defsubr (&Swindow_tree);
    defsubr (&Sset_window_margins);
    defsubr (&Swindow_margins);
    defsubr (&Sset_window_fringes);