# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1011603222 0
# Node ID 87fe94f01b8e2b8b08e33eed1f1a5423981f589c
# Parent  95d25103a45eb5ea494efd2da2c0014ec6451d51
(check_frame_size): Fix minimum height calculation.

diff -r 95d25103a45e -r 87fe94f01b8e src/window.c
--- a/src/window.c	Mon Jan 21 04:18:03 2002 +0000
+++ b/src/window.c	Mon Jan 21 08:53:42 2002 +0000
@@ -2142,13 +2142,12 @@
      int *rows, *cols;
 {
   /* For height, we have to see:
-     whether the frame has a minibuffer,
-     whether it wants a mode line, and
-     whether it has a menu bar.  */
-  int min_height =
-    (FRAME_MINIBUF_ONLY_P (frame) ? MIN_SAFE_WINDOW_HEIGHT - 1
-     : (! FRAME_HAS_MINIBUF_P (frame)) ? MIN_SAFE_WINDOW_HEIGHT
-     : 2 * MIN_SAFE_WINDOW_HEIGHT - 1);
+     how many windows the frame has at minimum (one or two),
+     and whether it has a menu bar or other special stuff at the top.  */
+  int min_height
+    = ((FRAME_MINIBUF_ONLY_P (frame) || ! FRAME_HAS_MINIBUF_P (frame))
+       ? MIN_SAFE_WINDOW_HEIGHT
+       : 2 * MIN_SAFE_WINDOW_HEIGHT);
   
   if (FRAME_TOP_MARGIN (frame) > 0)
     min_height += FRAME_TOP_MARGIN (frame);