[Emacs-diffs] Changes to emacs/src/window.c

[Richard M. Stallman]

Index: emacs/src/window.c
diff -c emacs/src/window.c:1.399 emacs/src/window.c:1.400
*** emacs/src/window.c:1.399    Sun Jan 20 18:09:45 2002
--- emacs/src/window.c  Mon Jan 21 03:53:42 2002
***************
*** 2142,2154 ****
       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);
    
    if (FRAME_TOP_MARGIN (frame) > 0)
      min_height += FRAME_TOP_MARGIN (frame);
--- 2142,2153 ----
       int *rows, *cols;
  {
    /* For height, we have to see:
!      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);