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.

2 files changed, 14 insertions, 9 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},