summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2001-08-03 09:55:40 +0000
committerGerd Moellmann <gerd@gnu.org>2001-08-03 09:55:40 +0000
commit18f9986a54c53f7712fee3bda487fb49771183f3 (patch)
treefd8f1c7a6cd5ad7c82dfad0d3cff4884c5fe9467 /src
parent3ae02d92b695374062c1ddb9eea29d2409e49036 (diff)
downloademacs-18f9986a54c53f7712fee3bda487fb49771183f3.tar.gz
(resize_mini_window): If Vmax_mini_window_height is
a float, determine the max height from the frame's height.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xdisp.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7519c2a2b5a..d5f0c03aad9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-03 Gerd Moellmann <gerd@gnu.org>
+
+ * xdisp.c (resize_mini_window): If Vmax_mini_window_height is
+ a float, determine the max height from the frame's height.
+
2001-08-02 Gerd Moellmann <gerd@gnu.org>
* xdisp.c (redisplay_internal): Take message_cleared_p into
diff --git a/src/xdisp.c b/src/xdisp.c
index 5a0b9b60394..88d85803617 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6547,7 +6547,7 @@ resize_mini_window (w, exact_p)
/* Compute the max. number of lines specified by the user. */
if (FLOATP (Vmax_mini_window_height))
- max_height = XFLOATINT (Vmax_mini_window_height) * total_height;
+ max_height = XFLOATINT (Vmax_mini_window_height) * FRAME_HEIGHT (f);
else if (INTEGERP (Vmax_mini_window_height))
max_height = XINT (Vmax_mini_window_height);
else