[Emacs-diffs] master e6013e8: In adjust_frame_size don't count minibuffer height twice (Bug#21643)

[Martin Rudalics]

branch: master
commit e6013e8c8f3de0ca39c17a2da95346b4a320e6d0
Author: Martin Rudalics <address@hidden>
Commit: Martin Rudalics <address@hidden>

    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)
---
 src/frame.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/frame.c b/src/frame.c
index f1a78fb..77ead08 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,
   int old_windows_width = WINDOW_PIXEL_WIDTH (r);
   int old_windows_height
     = (WINDOW_PIXEL_HEIGHT (r)
-       + (FRAME_HAS_MINIBUF_P (f)
+       + ((FRAME_HAS_MINIBUF_P (f) && !FRAME_MINIBUF_ONLY_P (f))
          ? WINDOW_PIXEL_HEIGHT (XWINDOW (FRAME_MINIBUF_WINDOW (f)))
          : 0));
   int new_windows_width, new_windows_height;