From 759399cdb1d74d282e02725f4e6769566b145e1f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 18 Sep 2020 22:50:36 +0300 Subject: [PATCH] Improve documentation of 'max-mini-window-height' * src/xdisp.c (syms_of_xdisp): * doc/lispref/minibuf.texi (Minibuffer Windows): More accurate wording in the documentation of 'max-mini-window-height', to clarify the meaning of an integer value. --- doc/lispref/minibuf.texi | 7 ++++--- src/xdisp.c | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi index c1615993f5e..ecab882fed7 100644 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi @@ -2418,9 +2418,10 @@ changes size automatically. In that case the window resizing commands @defopt max-mini-window-height This option provides a maximum height for resizing minibuffer windows -automatically. A floating-point number specifies a fraction of the -frame's height; an integer specifies the maximum number of lines. The -default value is 0.25. +automatically. A floating-point number specifies the maximum height +as a fraction of the frame's height; an integer specifies the maximum +height in units of the frame's canonical character height +(@pxref{Frame Font}). The default value is 0.25. @end defopt Note that the values of the above two variables take effect at display diff --git a/src/xdisp.c b/src/xdisp.c index ad0ab9987d8..d191ef51700 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -34830,8 +34830,10 @@ but does not change the fact they are interpreted as raw bytes. */); DEFVAR_LISP ("max-mini-window-height", Vmax_mini_window_height, doc: /* Maximum height for resizing mini-windows (the minibuffer and the echo area). -If a float, it specifies a fraction of the mini-window frame's height. -If an integer, it specifies a number of lines. */); +If a float, it specifies the maximum height in units of the +mini-window frame's height. +If an integer, it specifies the maximum height in units of the +mini-window frame's default font's height. */); Vmax_mini_window_height = make_float (0.25); DEFVAR_LISP ("resize-mini-windows", Vresize_mini_windows, -- 2.39.2