From 79c5ea9911a9aba7db0ba0e367e06507cee2fc02 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Thu, 27 Apr 2017 10:18:48 +0200 Subject: 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'. --- lisp/cus-start.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lisp/cus-start.el') 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 -- cgit v1.2.3