# HG changeset patch
# User Jim Blandy <jimb@redhat.com>
# Date 743996899 0
# Node ID d6b289b1a6dc282e2e242c5abc3672f5eb2385ea
# Parent  3011390123edb17999061283bb0754c45cb8a646
* window.c (check_frame_size): Include the menu bar height in the
minimum frame height.

diff -r 3011390123ed -r d6b289b1a6dc src/window.c
--- a/src/window.c	Fri Jul 30 01:39:20 1993 +0000
+++ b/src/window.c	Fri Jul 30 01:48:19 1993 +0000
@@ -1409,12 +1409,16 @@
      FRAME_PTR frame;
      int *rows, *cols;
 {
-  /* For height, we have to see whether the frame has a minibuffer, and
-     whether it wants a mode line.  */
+  /* 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);
+  if (FRAME_MENU_BAR_LINES (frame) > 0)
+    min_height += FRAME_MENU_BAR_LINES (frame);
 
   if (*rows < min_height)
     *rows = min_height;