Remove term "status" with "window combination limits".

* window.c (Fset_window_combination_limit): Rename argument
STATUS to LIMIT.
(Vwindow_combination_limit): Remove "status" from doc-string.
* windows.texi (Resizing Windows, Splitting Windows): Remove
term "status" when talking about combination limits.

4 files changed, 29 insertions, 18 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 150731bdb98..e8eaa00e0fa 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-20  Martin Rudalics  <rudalics@gmx.at>
+
+        * windows.texi (Resizing Windows, Splitting Windows): Remove
+        term "status" when talking about combination limits.
+
 2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
 
         * compile.texi (Compiler Errors):
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 4e67fa6d740..4a3aff1dc46 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -635,9 +635,9 @@ function @code{window-resizable} above.
 
 The choice of which window edges this function alters depends on the
 values of the option @code{window-combination-resize} and the
-combination-limit status of the involved windows; in some cases, it may
-alter both edges.  @xref{Splitting Windows}.  To resize by moving only
-the bottom or right edge of a window, use the function
+combination limits of the involved windows; in some cases, it may alter
+both edges.  @xref{Splitting Windows}.  To resize by moving only the
+bottom or right edge of a window, use the function
 @code{adjust-window-trailing-edge}, below.
 @end defun
 
@@ -954,14 +954,14 @@ how the window tree is rearranged when the child windows are deleted
 @end defopt
 
 @cindex window combination limit
-@defun set-window-combination-limit window status
+@defun set-window-combination-limit window limit
 This functions sets the @dfn{combination limit} of the window
-@var{window} to @var{status}.  This value can be retrieved via the
+@var{window} to @var{limit}.  This value can be retrieved via the
 function @code{window-combination-limit}.  See below for its effects;
 note that it is only meaningful for internal windows.  The
-@code{split-window} function automatically calls this function,
-passing the value of the variable @code{window-combination-limit} as
-@var{status}.
+@code{split-window} function automatically calls this function, passing
+the value of the variable @code{window-combination-limit} as
+@var{limit}.
 @end defun
 
 @defun window-combination-limit window
@@ -973,7 +973,7 @@ it is @code{nil}, then Emacs is allowed to automatically delete
 child windows of @var{window} with the child windows of one of its
 siblings to form a new window combination.  If the combination limit
 is @code{t}, the child windows of @var{window} are never automatically
-re-combined with its siblings'.
+re-combined with its siblings.
 @end defun
 
   To illustrate the effect of @code{window-combination-limit},
diff --git a/src/ChangeLog b/src/ChangeLog
index 75eeebd7b5c..94a02e6e9ba 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-20  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (Fset_window_combination_limit): Rename argument
+        STATUS to LIMIT.
+        (Vwindow_combination_limit): Remove "status" from doc-string.
+
 2011-11-20  Andreas Schwab  <schwab@linux-m68k.org>
 
         * m/ibms390.h: Remove.
diff --git a/src/window.c b/src/window.c
index 776f097b59e..4a5dcd85631 100644
--- a/src/window.c
+++ b/src/window.c
@@ -476,16 +476,16 @@ WINDOW are never \(re-)combined with WINDOW's siblings.  */)
 }
 
 DEFUN ("set-window-combination-limit", Fset_window_combination_limit, Sset_window_combination_limit, 2, 2, 0,
-       doc: /* Set combination limit of window WINDOW to STATUS; return STATUS.
-If STATUS is nil, child windows of WINDOW can be recombined with
-WINDOW's siblings.  STATUS t means that child windows of WINDOW are
+       doc: /* Set combination limit of window WINDOW to LIMIT; return LIMIT.
+If LIMIT is nil, child windows of WINDOW can be recombined with
+WINDOW's siblings.  LIMIT t means that child windows of WINDOW are
 never \(re-)combined with WINDOW's siblings.  Other values are reserved
 for future use.  */)
-  (Lisp_Object window, Lisp_Object status)
+  (Lisp_Object window, Lisp_Object limit)
 {
   register struct window *w = decode_any_window (window);
 
-  w->combination_limit = status;
+  w->combination_limit = limit;
 
   return w->combination_limit;
 }
@@ -6532,10 +6532,10 @@ sibling.
 
 Other values are reserved for future use.
 
-The value of this variable is also assigned to the combination-limit
-status of the new parent window.  The combination-limit status of a
-window can be retrieved via the function `window-combination-limit' and
-altered by the function `set-window-combination-limit'.  */);
+The value of this variable is also assigned to the combination limit of
+the new parent window.  The combination limit of a window can be
+retrieved via the function `window-combination-limit' and altered by the
+function `set-window-combination-limit'.  */);
   Vwindow_combination_limit = Qnil;
 
   defsubr (&Sselected_window);