diff options
| author | Paul Eggert | 2016-12-07 12:41:04 -0800 |
|---|---|---|
| committer | Paul Eggert | 2016-12-07 12:41:04 -0800 |
| commit | e676b7b80b5c5bd65b7a9f28fdac631cf78c22db (patch) | |
| tree | 19ce0dc5b3b9a2db7aa1b854026517c7d6fb92e2 /src | |
| parent | 8cd0d5df81a1cd4ed2187ac4b5a4202f3ad46c67 (diff) | |
| parent | d31298d8afa8166346fbc9206f38ec4b09a12204 (diff) | |
| download | emacs-e676b7b80b5c5bd65b7a9f28fdac631cf78c22db.tar.gz emacs-e676b7b80b5c5bd65b7a9f28fdac631cf78c22db.zip | |
Merge from origin/emacs-25
d31298d Fix documentation of `window-combination-resize'
2086f4c Typo fixes in elisp manual
Diffstat (limited to 'src')
| -rw-r--r-- | src/window.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c index acbefcdad16..e8798f1e3ee 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -7421,8 +7421,8 @@ same combination. | |||
| 7421 | 7421 | ||
| 7422 | Other values are reserved for future use. | 7422 | Other values are reserved for future use. |
| 7423 | 7423 | ||
| 7424 | This variable takes no effect if the variable `window-combination-limit' is | 7424 | A specific split operation may ignore the value of this variable if it |
| 7425 | non-nil. */); | 7425 | is affected by a non-nil value of `window-combination-limit'. */); |
| 7426 | Vwindow_combination_resize = Qnil; | 7426 | Vwindow_combination_resize = Qnil; |
| 7427 | 7427 | ||
| 7428 | DEFVAR_LISP ("window-combination-limit", Vwindow_combination_limit, | 7428 | DEFVAR_LISP ("window-combination-limit", Vwindow_combination_limit, |