diff options
| author | Martin Rudalics | 2015-10-09 11:55:06 +0200 |
|---|---|---|
| committer | Martin Rudalics | 2015-10-09 11:55:06 +0200 |
| commit | e6013e8c8f3de0ca39c17a2da95346b4a320e6d0 (patch) | |
| tree | 17c6307e3eebea11de4f82f21d08cb21854429e3 | |
| parent | c4d8c6aaade23a33df93332c3320234392749578 (diff) | |
| download | emacs-e6013e8c8f3de0ca39c17a2da95346b4a320e6d0.tar.gz emacs-e6013e8c8f3de0ca39c17a2da95346b4a320e6d0.zip | |
In adjust_frame_size don't count minibuffer height twice (Bug#21643)
* src/frame.c (adjust_frame_size): In minibuffer-only windows
don't count minibuffer height twice. (Bug#21643)
| -rw-r--r-- | src/frame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/frame.c b/src/frame.c index f1a78fbdbf8..77ead082ce2 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -396,7 +396,7 @@ adjust_frame_size (struct frame *f, int new_width, int new_height, int inhibit, | |||
| 396 | int old_windows_width = WINDOW_PIXEL_WIDTH (r); | 396 | int old_windows_width = WINDOW_PIXEL_WIDTH (r); |
| 397 | int old_windows_height | 397 | int old_windows_height |
| 398 | = (WINDOW_PIXEL_HEIGHT (r) | 398 | = (WINDOW_PIXEL_HEIGHT (r) |
| 399 | + (FRAME_HAS_MINIBUF_P (f) | 399 | + ((FRAME_HAS_MINIBUF_P (f) && !FRAME_MINIBUF_ONLY_P (f)) |
| 400 | ? WINDOW_PIXEL_HEIGHT (XWINDOW (FRAME_MINIBUF_WINDOW (f))) | 400 | ? WINDOW_PIXEL_HEIGHT (XWINDOW (FRAME_MINIBUF_WINDOW (f))) |
| 401 | : 0)); | 401 | : 0)); |
| 402 | int new_windows_width, new_windows_height; | 402 | int new_windows_width, new_windows_height; |