From: Martin Rudalics <rudalics@gmx.at>
Date: Thu, 1 Dec 2016 09:51:11 +0000 (+0100)
Subject: Fix documentation of `window-combination-resize'
X-Git-Tag: emacs-25.1.91~45
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d31298d;p=emacs.git

Fix documentation of `window-combination-resize'

* src/window.c (Vwindow_combination_resize): Fix doc-string.
* doc/lispref/windows.texi (Recombining Windows): Fix
documentation of `window-combination-resize'.
---

diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index a9965a116c3..042e0cc35b6 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -1602,9 +1602,9 @@ window or too small to ordinarily split.  Furthermore, subsequently
 resizing or deleting @var{window} may resize all other windows in its
 combination.
 
-The default is @code{nil}.  Other values are reserved for future use.
-The value of this variable is ignored when
-@code{window-combination-limit} is non-@code{nil}.
+The default is @code{nil}.  Other values are reserved for future use.  A
+specific split operation may ignore the value of this variable if it is
+affected by a non-@code{nil} value of @code{window-combination-limit}.
 @end defopt
 
   To illustrate the effect of @code{window-combination-resize}, consider
diff --git a/src/window.c b/src/window.c
index 733cf75d132..8d86f7f0815 100644
--- a/src/window.c
+++ b/src/window.c
@@ -7269,8 +7269,8 @@ same combination.
 
 Other values are reserved for future use.
 
-This variable takes no effect if the variable `window-combination-limit' is
-non-nil.  */);
+A specific split operation may ignore the value of this variable if it
+is affected by a non-nil value of `window-combination-limit'.  */);
   Vwindow_combination_resize = Qnil;
 
   DEFVAR_LISP ("window-combination-limit", Vwindow_combination_limit,