aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2005-10-07 22:17:05 +0000
committerKim F. Storm2005-10-07 22:17:05 +0000
commitc16e1cc347476e4995c2eac6e99d2781688e8fc5 (patch)
tree53c74dce38c0fcb8f1cd086678c1b2362d32f4bb /src
parentef1b4c9ecd7ad3896a7ef1bdd7f24aeb47359ead (diff)
downloademacs-c16e1cc347476e4995c2eac6e99d2781688e8fc5.tar.gz
emacs-c16e1cc347476e4995c2eac6e99d2781688e8fc5.zip
(window_tree, Fwindow_tree): Rename fns added 2005-10-04.
Diffstat (limited to 'src')
-rw-r--r--src/window.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/window.c b/src/window.c
index d282c2dd3f4..3e9354a7ba8 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6232,7 +6232,7 @@ usage: (save-window-excursion BODY ...) */)
6232 ***********************************************************************/ 6232 ***********************************************************************/
6233 6233
6234static Lisp_Object 6234static Lisp_Object
6235window_split_tree (w) 6235window_tree (w)
6236 struct window *w; 6236 struct window *w;
6237{ 6237{
6238 Lisp_Object tail = Qnil; 6238 Lisp_Object tail = Qnil;
@@ -6245,10 +6245,10 @@ window_split_tree (w)
6245 XSETWINDOW (wn, w); 6245 XSETWINDOW (wn, w);
6246 if (!NILP (w->hchild)) 6246 if (!NILP (w->hchild))
6247 wn = Fcons (Qnil, Fcons (Fwindow_edges (wn), 6247 wn = Fcons (Qnil, Fcons (Fwindow_edges (wn),
6248 window_split_tree (XWINDOW (w->hchild)))); 6248 window_tree (XWINDOW (w->hchild))));
6249 else if (!NILP (w->vchild)) 6249 else if (!NILP (w->vchild))
6250 wn = Fcons (Qt, Fcons (Fwindow_edges (wn), 6250 wn = Fcons (Qt, Fcons (Fwindow_edges (wn),
6251 window_split_tree (XWINDOW (w->vchild)))); 6251 window_tree (XWINDOW (w->vchild))));
6252 6252
6253 if (NILP (result)) 6253 if (NILP (result))
6254 { 6254 {
@@ -6268,12 +6268,12 @@ window_split_tree (w)
6268 6268
6269 6269
6270 6270
6271DEFUN ("window-split-tree", Fwindow_split_tree, Swindow_split_tree, 6271DEFUN ("window-tree", Fwindow_tree, Swindow_tree,
6272 0, 1, 0, 6272 0, 1, 0,
6273 doc: /* Return the window split tree for frame FRAME. 6273 doc: /* Return the window tree for frame FRAME.
6274 6274
6275The return value is a list of the form (ROOT MINI), where ROOT 6275The return value is a list of the form (ROOT MINI), where ROOT
6276represents the window split tree of the frame's root window, and MINI 6276represents the window tree of the frame's root window, and MINI
6277is the frame's minibuffer window. 6277is the frame's minibuffer window.
6278 6278
6279If the root window is not split, ROOT is the root window itself. 6279If the root window is not split, ROOT is the root window itself.
@@ -6301,7 +6301,7 @@ selected frame. */)
6301 if (!FRAME_LIVE_P (f)) 6301 if (!FRAME_LIVE_P (f))
6302 return Qnil; 6302 return Qnil;
6303 6303
6304 return window_split_tree (XWINDOW (FRAME_ROOT_WINDOW (f))); 6304 return window_tree (XWINDOW (FRAME_ROOT_WINDOW (f)));
6305} 6305}
6306 6306
6307 6307
@@ -7110,7 +7110,7 @@ The selected frame is the one whose configuration has changed. */);
7110 defsubr (&Sset_window_configuration); 7110 defsubr (&Sset_window_configuration);
7111 defsubr (&Scurrent_window_configuration); 7111 defsubr (&Scurrent_window_configuration);
7112 defsubr (&Ssave_window_excursion); 7112 defsubr (&Ssave_window_excursion);
7113 defsubr (&Swindow_split_tree); 7113 defsubr (&Swindow_tree);
7114 defsubr (&Sset_window_margins); 7114 defsubr (&Sset_window_margins);
7115 defsubr (&Swindow_margins); 7115 defsubr (&Swindow_margins);
7116 defsubr (&Sset_window_fringes); 7116 defsubr (&Sset_window_fringes);