diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-12-07 12:41:04 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-12-07 12:41:04 -0800 |
| commit | e676b7b80b5c5bd65b7a9f28fdac631cf78c22db (patch) | |
| tree | 19ce0dc5b3b9a2db7aa1b854026517c7d6fb92e2 /doc/lispref/windows.texi | |
| parent | 8cd0d5df81a1cd4ed2187ac4b5a4202f3ad46c67 (diff) | |
| parent | d31298d8afa8166346fbc9206f38ec4b09a12204 (diff) | |
| download | emacs-e676b7b80b5c5bd65b7a9f28fdac631cf78c22db.tar.gz emacs-e676b7b80b5c5bd65b7a9f28fdac631cf78c22db.tar.bz2 emacs-e676b7b80b5c5bd65b7a9f28fdac631cf78c22db.zip | |
Merge from origin/emacs-25
d31298d Fix documentation of `window-combination-resize'
2086f4c Typo fixes in elisp manual
Diffstat (limited to 'doc/lispref/windows.texi')
| -rw-r--r-- | doc/lispref/windows.texi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 2823cc55214..4dc671c41f3 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -1620,9 +1620,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 |