diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2017-04-27 10:18:48 +0200 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2017-04-27 10:18:48 +0200 |
| commit | 79c5ea9911a9aba7db0ba0e367e06507cee2fc02 (patch) | |
| tree | c94b6576e5d5d4fd0a53a700b911a6e470ecc79d /lisp/cus-start.el | |
| parent | ee42f02c91a6d50d67e32c34a66029f5ee9a26ed (diff) | |
| download | emacs-79c5ea9911a9aba7db0ba0e367e06507cee2fc02.tar.gz | |
Fix doc and customization type of `window-combination-limit' (Bug#26673)
* src/window.c (Vwindow_combination_limit): Fix doc-string.
* lisp/cus-start.el (window-combination-limit): Fix
customization type.
* doc/lispref/windows.texi (Recombining Windows): Fix
documentation of `window-combination-limit'.
Diffstat (limited to 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index a507e30ca9c..117b23debef 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -498,14 +498,16 @@ since it could result in memory overflow and make Emacs crash." (window-combination-limit windows (choice (const :tag "Never (nil)" :value nil) - (const :tag "For Temp Buffer Resize mode (temp-buffer-resize)" + (const :tag "If requested via buffer display alist (window-size)" + :value window-size) + (const :tag "With Temp Buffer Resize mode (temp-buffer-resize)" :value temp-buffer-resize) (const :tag "For temporary buffers (temp-buffer)" :value temp-buffer) (const :tag "For buffer display (display-buffer)" :value display-buffer) (other :tag "Always (t)" :value t)) - "24.3") + "26.1") (fast-but-imprecise-scrolling scrolling boolean "25.1") (window-resize-pixelwise windows boolean "24.4") ;; xdisp.c |