diff options
| author | Gerd Moellmann | 2001-08-03 09:55:40 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-08-03 09:55:40 +0000 |
| commit | 18f9986a54c53f7712fee3bda487fb49771183f3 (patch) | |
| tree | fd8f1c7a6cd5ad7c82dfad0d3cff4884c5fe9467 /src | |
| parent | 3ae02d92b695374062c1ddb9eea29d2409e49036 (diff) | |
| download | emacs-18f9986a54c53f7712fee3bda487fb49771183f3.tar.gz emacs-18f9986a54c53f7712fee3bda487fb49771183f3.zip | |
(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/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
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 @@ | |||
| 1 | 2001-08-03 Gerd Moellmann <gerd@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (resize_mini_window): If Vmax_mini_window_height is | ||
| 4 | a float, determine the max height from the frame's height. | ||
| 5 | |||
| 1 | 2001-08-02 Gerd Moellmann <gerd@gnu.org> | 6 | 2001-08-02 Gerd Moellmann <gerd@gnu.org> |
| 2 | 7 | ||
| 3 | * xdisp.c (redisplay_internal): Take message_cleared_p into | 8 | * 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) | |||
| 6547 | 6547 | ||
| 6548 | /* Compute the max. number of lines specified by the user. */ | 6548 | /* Compute the max. number of lines specified by the user. */ |
| 6549 | if (FLOATP (Vmax_mini_window_height)) | 6549 | if (FLOATP (Vmax_mini_window_height)) |
| 6550 | max_height = XFLOATINT (Vmax_mini_window_height) * total_height; | 6550 | max_height = XFLOATINT (Vmax_mini_window_height) * FRAME_HEIGHT (f); |
| 6551 | else if (INTEGERP (Vmax_mini_window_height)) | 6551 | else if (INTEGERP (Vmax_mini_window_height)) |
| 6552 | max_height = XINT (Vmax_mini_window_height); | 6552 | max_height = XINT (Vmax_mini_window_height); |
| 6553 | else | 6553 | else |