Commit be7f5545 authored by Martin Rudalics's avatar Martin Rudalics

Remove term "subwindow" from code and documentation.

* window.h: Declare delete_all_child_windows instead of
delete_all_subwindows.
* window.c (Fwindow_nest, Fset_window_nest)
(Fset_window_new_total, Fset_window_new_normal)
(Fwindow_resize_apply): Don't use term subwindow in doc-strings.
(delete_all_subwindows): Rename to delete_all_child_windows.
(Fdelete_other_windows_internal, Fset_window_configuration):
Call delete_all_child_windows instead of delete_all_subwindows.
* frame.c (delete_frame): Call delete_all_child_windows instead
of delete_all_subwindows.

* window.el (window-combinations): Make WINDOW argument
mandatory.  Rewrite doc-string.
(walk-window-subtree, window-atom-check, window-min-delta)
(window-max-delta, window--resize-this-window)
(window--resize-root-window-vertically, window-tree)
(balance-windows, window-state-put): Rewrite doc-strings as to
not mention the term "subwindow".
(window--resize-subwindows-skip-p): Rename to
window--resize-child-windows-skip-p.
(window--resize-subwindows-normal): Rename to
window--resize-child-windows-normal.
(window--resize-subwindows): Rename to
window--resize-child-windows.
(window-or-subwindow-p): Rename to window--in-subtree-p.

* windows.texi (Resizing Windows, Splitting Windows)
(Window Configurations): Use "child window" instead of
"subwindow".
parent ca78dc43
2011-11-07 Martin Rudalics <rudalics@gmx.at>
* windows.texi (Resizing Windows, Splitting Windows)
(Window Configurations): Use "child window" instead of
"subwindow".
2011-11-06 Chong Yidong <cyd@gnu.org> 2011-11-06 Chong Yidong <cyd@gnu.org>
* windows.texi (Basic Windows): Clarify various definitions. * windows.texi (Basic Windows): Clarify various definitions.
......
...@@ -719,7 +719,7 @@ Optional argument @var{noup} non-@code{nil} means don't go up in the ...@@ -719,7 +719,7 @@ Optional argument @var{noup} non-@code{nil} means don't go up in the
window tree but try to steal or distribute the space needed for the window tree but try to steal or distribute the space needed for the
resize operation among the other windows within @var{window}'s resize operation among the other windows within @var{window}'s
combination. Optional argument @var{nodown} non-@code{nil} means don't combination. Optional argument @var{nodown} non-@code{nil} means don't
check whether @var{window} itself and its subwindows can be resized. check whether @var{window} itself and its child windows can be resized.
@end defun @end defun
The function @code{window-resizable} does not change any window sizes. The function @code{window-resizable} does not change any window sizes.
...@@ -1352,15 +1352,15 @@ windows only. ...@@ -1352,15 +1352,15 @@ windows only.
@cindex nest status @cindex nest status
The @dfn{nest status} of a window specifies whether that window may be The @dfn{nest status} of a window specifies whether that window may be
removed and its subwindows recombined with that window's siblings when removed and its child windows recombined with that window's siblings
such a sibling's subwindow is deleted. The nest status is initially when such a sibling's child window is deleted. The nest status is
assigned by @code{split-window} from the current value of the variable initially assigned by @code{split-window} from the current value of the
@code{window-nest} (see above) and can be reset by the function variable @code{window-nest} (see above) and can be reset by the function
@code{set-window-nest} (see below). @code{set-window-nest} (see below).
If the return value is @code{nil}, subwindows of @var{window} may be If the return value is @code{nil}, child windows of @var{window} may be
recombined with @var{window}'s siblings when a window gets deleted. A recombined with @var{window}'s siblings when a window gets deleted. A
return value of @code{nil} means that subwindows of @var{window} are return value of @code{nil} means that child windows of @var{window} are
never (re-)combined with @var{window}'s siblings in such a case. never (re-)combined with @var{window}'s siblings in such a case.
@end defun @end defun
...@@ -3740,7 +3740,7 @@ selected one. ...@@ -3740,7 +3740,7 @@ selected one.
The optional argument @var{ignore} non-@code{nil} means to ignore The optional argument @var{ignore} non-@code{nil} means to ignore
minimum window sizes and fixed size restrictions. If @var{ignore} minimum window sizes and fixed size restrictions. If @var{ignore}
equals @code{safe}, this means subwindows can get as small as one line equals @code{safe}, this means windows can get as small as one line
and/or two columns. and/or two columns.
@end defun @end defun
......
2011-11-07 Martin Rudalics <rudalics@gmx.at>
* window.el (window-combinations): Make WINDOW argument
mandatory. Rewrite doc-string.
(walk-window-subtree, window-atom-check, window-min-delta)
(window-max-delta, window--resize-this-window)
(window--resize-root-window-vertically, window-tree)
(balance-windows, window-state-put): Rewrite doc-strings as to
not mention the term "subwindow".
(window--resize-subwindows-skip-p): Rename to
window--resize-child-windows-skip-p.
(window--resize-subwindows-normal): Rename to
window--resize-child-windows-normal.
(window--resize-subwindows): Rename to
window--resize-child-windows.
(window-or-subwindow-p): Rename to window--in-subtree-p.
2011-11-07 Mark Lillibridge <mark.lillibridge@hp.com> (tiny change) 2011-11-07 Mark Lillibridge <mark.lillibridge@hp.com> (tiny change)
* mail/rmail.el (rmail-get-new-mail, rmail-insert-inbox-text): * mail/rmail.el (rmail-get-new-mail, rmail-insert-inbox-text):
......
This diff is collapsed.
2011-11-07 Martin Rudalics <rudalics@gmx.at>
* window.h: Declare delete_all_child_windows instead of
delete_all_subwindows.
* window.c (Fwindow_nest, Fset_window_nest)
(Fset_window_new_total, Fset_window_new_normal)
(Fwindow_resize_apply): Don't use term subwindow in doc-strings.
(delete_all_subwindows): Rename to delete_all_child_windows.
(Fdelete_other_windows_internal, Fset_window_configuration):
Call delete_all_child_windows instead of delete_all_subwindows.
* frame.c (delete_frame): Call delete_all_child_windows instead
of delete_all_subwindows.
2011-11-07 Paul Eggert <eggert@cs.ucla.edu> 2011-11-07 Paul Eggert <eggert@cs.ucla.edu>
* alloc.c (DEADP): New macro, for porting to GNU/Hurd (Bug#9926). * alloc.c (DEADP): New macro, for porting to GNU/Hurd (Bug#9926).
......
...@@ -1320,7 +1320,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force) ...@@ -1320,7 +1320,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
/* Mark all the windows that used to be on FRAME as deleted, and then /* Mark all the windows that used to be on FRAME as deleted, and then
remove the reference to them. */ remove the reference to them. */
delete_all_subwindows (f->root_window); delete_all_child_windows (f->root_window);
f->root_window = Qnil; f->root_window = Qnil;
Vframe_list = Fdelq (frame, Vframe_list); Vframe_list = Fdelq (frame, Vframe_list);
......
...@@ -504,8 +504,8 @@ DEFUN ("window-nest", Fwindow_nest, Swindow_nest, 0, 1, 0, ...@@ -504,8 +504,8 @@ DEFUN ("window-nest", Fwindow_nest, Swindow_nest, 0, 1, 0,
doc: /* Return nest status of window WINDOW. doc: /* Return nest status of window WINDOW.
If WINDOW is omitted or nil, it defaults to the selected window. If WINDOW is omitted or nil, it defaults to the selected window.
If the return value is nil, subwindows of WINDOW can be recombined with If the return value is nil, child windows of WINDOW can be recombined with
WINDOW's siblings. A return value of non-nil means that subwindows of WINDOW's siblings. A return value of non-nil means that child windows of
WINDOW are never \(re-)combined with WINDOW's siblings. */) WINDOW are never \(re-)combined with WINDOW's siblings. */)
(Lisp_Object window) (Lisp_Object window)
{ {
...@@ -516,8 +516,8 @@ DEFUN ("set-window-nest", Fset_window_nest, Sset_window_nest, 2, 2, 0, ...@@ -516,8 +516,8 @@ DEFUN ("set-window-nest", Fset_window_nest, Sset_window_nest, 2, 2, 0,
doc: /* Set nest status of window WINDOW to STATUS; return STATUS. doc: /* Set nest status of window WINDOW to STATUS; return STATUS.
If WINDOW is omitted or nil, it defaults to the selected window. If WINDOW is omitted or nil, it defaults to the selected window.
If STATUS is nil, subwindows of WINDOW can be recombined with WINDOW's If STATUS is nil, child windows of WINDOW can be recombined with WINDOW's
siblings. STATUS non-nil means that subwindows of WINDOW are never siblings. STATUS non-nil means that child windows of WINDOW are never
\(re-)combined with WINDOW's siblings. */) \(re-)combined with WINDOW's siblings. */)
(Lisp_Object window, Lisp_Object status) (Lisp_Object window, Lisp_Object status)
{ {
...@@ -2571,9 +2571,9 @@ DEFUN ("delete-other-windows-internal", Fdelete_other_windows_internal, ...@@ -2571,9 +2571,9 @@ DEFUN ("delete-other-windows-internal", Fdelete_other_windows_internal,
Only the frame WINDOW is on is affected. WINDOW may be any window and Only the frame WINDOW is on is affected. WINDOW may be any window and
defaults to the selected one. defaults to the selected one.
Optional argument ROOT, if non-nil, must specify an internal window Optional argument ROOT, if non-nil, must specify an internal window such
containing WINDOW as a subwindow. If this is the case, replace ROOT by that WINDOW is in its window subtree. If this is the case, replace ROOT
WINDOW and leave alone any windows not contained in ROOT. by WINDOW and leave alone any windows not part of ROOT's subtree.
When WINDOW is live try to reduce display jumps by keeping the text When WINDOW is live try to reduce display jumps by keeping the text
previously visible in WINDOW in the same place on the frame. Doing this previously visible in WINDOW in the same place on the frame. Doing this
...@@ -2637,10 +2637,10 @@ window-start value is reasonable when this function is called. */) ...@@ -2637,10 +2637,10 @@ window-start value is reasonable when this function is called. */)
} }
else else
{ {
/* See if the frame's selected window is a subwindow of WINDOW, by /* See if the frame's selected window is a part of the window
finding all the selected window's parents and comparing each subtree rooted at WINDOW, by finding all the selected window's
one with WINDOW. If it isn't we need a new selected window for parents and comparing each one with WINDOW. If it isn't we
this frame. */ need a new selected window for this frame. */
swindow = FRAME_SELECTED_WINDOW (f); swindow = FRAME_SELECTED_WINDOW (f);
while (1) while (1)
{ {
...@@ -2676,7 +2676,7 @@ window-start value is reasonable when this function is called. */) ...@@ -2676,7 +2676,7 @@ window-start value is reasonable when this function is called. */)
if (NILP (w->buffer)) if (NILP (w->buffer))
{ {
/* Resize subwindows vertically. */ /* Resize child windows vertically. */
XSETINT (delta, XINT (r->total_lines) - XINT (w->total_lines)); XSETINT (delta, XINT (r->total_lines) - XINT (w->total_lines));
w->top_line = r->top_line; w->top_line = r->top_line;
resize_root_window (window, delta, Qnil, Qnil); resize_root_window (window, delta, Qnil, Qnil);
...@@ -2691,7 +2691,7 @@ window-start value is reasonable when this function is called. */) ...@@ -2691,7 +2691,7 @@ window-start value is reasonable when this function is called. */)
resize_failed = 1; resize_failed = 1;
} }
/* Resize subwindows horizontally. */ /* Resize child windows horizontally. */
if (!resize_failed) if (!resize_failed)
{ {
w->left_col = r->left_col; w->left_col = r->left_col;
...@@ -2740,15 +2740,15 @@ window-start value is reasonable when this function is called. */) ...@@ -2740,15 +2740,15 @@ window-start value is reasonable when this function is called. */)
XWINDOW (w->parent)->hchild = sibling; XWINDOW (w->parent)->hchild = sibling;
} }
/* Delete ROOT and all subwindows of ROOT. */ /* Delete ROOT and all child windows of ROOT. */
if (!NILP (r->vchild)) if (!NILP (r->vchild))
{ {
delete_all_subwindows (r->vchild); delete_all_child_windows (r->vchild);
r->vchild = Qnil; r->vchild = Qnil;
} }
else if (!NILP (r->hchild)) else if (!NILP (r->hchild))
{ {
delete_all_subwindows (r->hchild); delete_all_child_windows (r->hchild);
r->hchild = Qnil; r->hchild = Qnil;
} }
...@@ -3349,7 +3349,7 @@ Return SIZE. ...@@ -3349,7 +3349,7 @@ Return SIZE.
Optional argument ADD non-nil means add SIZE to the new total size of Optional argument ADD non-nil means add SIZE to the new total size of
WINDOW and return the sum. WINDOW and return the sum.
Note: This function does not operate on any subwindows of WINDOW. */) Note: This function does not operate on any child windows of WINDOW. */)
(Lisp_Object window, Lisp_Object size, Lisp_Object add) (Lisp_Object window, Lisp_Object size, Lisp_Object add)
{ {
struct window *w = decode_any_window (window); struct window *w = decode_any_window (window);
...@@ -3367,7 +3367,7 @@ DEFUN ("set-window-new-normal", Fset_window_new_normal, Sset_window_new_normal, ...@@ -3367,7 +3367,7 @@ DEFUN ("set-window-new-normal", Fset_window_new_normal, Sset_window_new_normal,
doc: /* Set new normal size of WINDOW to SIZE. doc: /* Set new normal size of WINDOW to SIZE.
Return SIZE. Return SIZE.
Note: This function does not operate on any subwindows of WINDOW. */) Note: This function does not operate on any child windows of WINDOW. */)
(Lisp_Object window, Lisp_Object size) (Lisp_Object window, Lisp_Object size)
{ {
struct window *w = decode_any_window (window); struct window *w = decode_any_window (window);
...@@ -3378,7 +3378,7 @@ Note: This function does not operate on any subwindows of WINDOW. */) ...@@ -3378,7 +3378,7 @@ Note: This function does not operate on any subwindows of WINDOW. */)
/* Return 1 if setting w->total_lines (w->total_cols if HORFLAG is /* Return 1 if setting w->total_lines (w->total_cols if HORFLAG is
non-zero) to w->new_total would result in correct heights (widths) non-zero) to w->new_total would result in correct heights (widths)
for window W and recursively all subwindows of W. for window W and recursively all child windows of W.
Note: This function does not check any of `window-fixed-size-p', Note: This function does not check any of `window-fixed-size-p',
`window-min-height' or `window-min-width'. It does check that window `window-min-height' or `window-min-width'. It does check that window
...@@ -3393,7 +3393,7 @@ window_resize_check (struct window *w, int horflag) ...@@ -3393,7 +3393,7 @@ window_resize_check (struct window *w, int horflag)
{ {
c = XWINDOW (w->vchild); c = XWINDOW (w->vchild);
if (horflag) if (horflag)
/* All subwindows of W must have the same width as W. */ /* All child windows of W must have the same width as W. */
{ {
while (c) while (c)
{ {
...@@ -3405,8 +3405,8 @@ window_resize_check (struct window *w, int horflag) ...@@ -3405,8 +3405,8 @@ window_resize_check (struct window *w, int horflag)
return 1; return 1;
} }
else else
/* The sum of the heights of the subwindows of W must equal W's /* The sum of the heights of the child windows of W must equal
height. */ W's height. */
{ {
int sum_of_sizes = 0; int sum_of_sizes = 0;
while (c) while (c)
...@@ -3424,7 +3424,7 @@ window_resize_check (struct window *w, int horflag) ...@@ -3424,7 +3424,7 @@ window_resize_check (struct window *w, int horflag)
{ {
c = XWINDOW (w->hchild); c = XWINDOW (w->hchild);
if (horflag) if (horflag)
/* The sum of the widths of the subwindows of W must equal W's /* The sum of the widths of the child windows of W must equal W's
width. */ width. */
{ {
int sum_of_sizes = 0; int sum_of_sizes = 0;
...@@ -3438,7 +3438,7 @@ window_resize_check (struct window *w, int horflag) ...@@ -3438,7 +3438,7 @@ window_resize_check (struct window *w, int horflag)
return (sum_of_sizes == XINT (w->new_total)); return (sum_of_sizes == XINT (w->new_total));
} }
else else
/* All subwindows of W must have the same height as W. */ /* All child windows of W must have the same height as W. */
{ {
while (c) while (c)
{ {
...@@ -3458,9 +3458,9 @@ window_resize_check (struct window *w, int horflag) ...@@ -3458,9 +3458,9 @@ window_resize_check (struct window *w, int horflag)
} }
/* Set w->total_lines (w->total_cols if HORIZONTAL is non-zero) to /* Set w->total_lines (w->total_cols if HORIZONTAL is non-zero) to
w->new_total for window W and recursively all subwindows of W. Also w->new_total for window W and recursively all child windows of W.
calculate and assign the new vertical (horizontal) start positions of Also calculate and assign the new vertical (horizontal) start
each of these windows. positions of each of these windows.
This function does not perform any error checks. Make sure you have This function does not perform any error checks. Make sure you have
run window_resize_check on W before applying this function. */ run window_resize_check on W before applying this function. */
...@@ -3534,8 +3534,8 @@ Optional argument HORIZONTAL omitted or nil means apply requested height ...@@ -3534,8 +3534,8 @@ Optional argument HORIZONTAL omitted or nil means apply requested height
values. HORIZONTAL non-nil means apply requested width values. values. HORIZONTAL non-nil means apply requested width values.
This function checks whether the requested values sum up to a valid This function checks whether the requested values sum up to a valid
window layout, recursively assigns the new sizes of all subwindows and window layout, recursively assigns the new sizes of all child windows
calculates and assigns the new start positions of these windows. and calculates and assigns the new start positions of these windows.
Note: This function does not check any of `window-fixed-size-p', Note: This function does not check any of `window-fixed-size-p',
`window-min-height' or `window-min-width'. All these checks have to `window-min-height' or `window-min-width'. All these checks have to
...@@ -3931,12 +3931,12 @@ Signal an error when WINDOW is the only window on its frame. */) ...@@ -3931,12 +3931,12 @@ Signal an error when WINDOW is the only window on its frame. */)
if (!NILP (w->vchild)) if (!NILP (w->vchild))
{ {
delete_all_subwindows (w->vchild); delete_all_child_windows (w->vchild);
w->vchild = Qnil; w->vchild = Qnil;
} }
else if (!NILP (w->hchild)) else if (!NILP (w->hchild))
{ {
delete_all_subwindows (w->hchild); delete_all_child_windows (w->hchild);
w->hchild = Qnil; w->hchild = Qnil;
} }
else if (!NILP (w->buffer)) else if (!NILP (w->buffer))
...@@ -5515,7 +5515,7 @@ the return value is nil. Otherwise the value is t. */) ...@@ -5515,7 +5515,7 @@ the return value is nil. Otherwise the value is t. */)
Save their current buffers in their height fields, since we may Save their current buffers in their height fields, since we may
need it later, if a buffer saved in the configuration is now need it later, if a buffer saved in the configuration is now
dead. */ dead. */
delete_all_subwindows (FRAME_ROOT_WINDOW (f)); delete_all_child_windows (FRAME_ROOT_WINDOW (f));
for (k = 0; k < saved_windows->header.size; k++) for (k = 0; k < saved_windows->header.size; k++)
{ {
...@@ -5729,10 +5729,10 @@ the return value is nil. Otherwise the value is t. */) ...@@ -5729,10 +5729,10 @@ the return value is nil. Otherwise the value is t. */)
} }
/* Delete all subwindows reachable via the next, vchild, and hchild /* Recursively delete all child windows reachable via the next, vchild,
slots of WINDOW. */ and hchild slots of WINDOW. */
void void
delete_all_subwindows (Lisp_Object window) delete_all_child_windows (Lisp_Object window)
{ {
register struct window *w; register struct window *w;
...@@ -5740,18 +5740,18 @@ delete_all_subwindows (Lisp_Object window) ...@@ -5740,18 +5740,18 @@ delete_all_subwindows (Lisp_Object window)
if (!NILP (w->next)) if (!NILP (w->next))
/* Delete WINDOW's siblings (we traverse postorderly). */ /* Delete WINDOW's siblings (we traverse postorderly). */
delete_all_subwindows (w->next); delete_all_child_windows (w->next);
w->total_lines = w->buffer; /* See Fset_window_configuration for excuse. */ w->total_lines = w->buffer; /* See Fset_window_configuration for excuse. */
if (!NILP (w->vchild)) if (!NILP (w->vchild))
{ {
delete_all_subwindows (w->vchild); delete_all_child_windows (w->vchild);
w->vchild = Qnil; w->vchild = Qnil;
} }
else if (!NILP (w->hchild)) else if (!NILP (w->hchild))
{ {
delete_all_subwindows (w->hchild); delete_all_child_windows (w->hchild);
w->hchild = Qnil; w->hchild = Qnil;
} }
else if (!NILP (w->buffer)) else if (!NILP (w->buffer))
......
...@@ -824,7 +824,7 @@ extern Lisp_Object window_from_coordinates (struct frame *, int, int, ...@@ -824,7 +824,7 @@ extern Lisp_Object window_from_coordinates (struct frame *, int, int,
enum window_part *, int); enum window_part *, int);
EXFUN (Fwindow_dedicated_p, 1); EXFUN (Fwindow_dedicated_p, 1);
extern void resize_frame_windows (struct frame *, int, int); extern void resize_frame_windows (struct frame *, int, int);
extern void delete_all_subwindows (Lisp_Object); extern void delete_all_child_windows (Lisp_Object);
extern void freeze_window_starts (struct frame *, int); extern void freeze_window_starts (struct frame *, int);
extern void grow_mini_window (struct window *, int); extern void grow_mini_window (struct window *, int);
extern void shrink_mini_window (struct window *); extern void shrink_mini_window (struct window *);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment