From: Martin Rudalics <rudalics@gmx.at>
Date: Fri, 9 Oct 2015 09:55:06 +0000 (+0200)
Subject: In adjust_frame_size don't count minibuffer height twice (Bug#21643)
X-Git-Tag: emacs-25.0.90~1186
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e6013e8c8f3de0ca39c17a2da95346b4a320e6d0;p=emacs.git

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)
---

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,
   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;