From: Richard M. Stallman Date: Fri, 18 Jan 2002 18:25:52 +0000 (+0000) Subject: (WINDOW_WANTS_MODELINE_P): Check window height > 1. X-Git-Tag: ttn-vms-21-2-B4~17082 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2e8834eda67099373c9ca2ed115dd902924b1649;p=emacs.git (WINDOW_WANTS_MODELINE_P): Check window height > 1. (WINDOW_WANTS_HEADER_LINE_P): Check window height provides room. --- diff --git a/src/dispextern.h b/src/dispextern.h index 99ee1368182..74726f02559 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1112,20 +1112,22 @@ extern struct glyph_row scratch_glyph_row; /* Value is non-zero if window W wants a mode line. */ #define WINDOW_WANTS_MODELINE_P(W) \ - (!MINI_WINDOW_P (W) \ + (!MINI_WINDOW_P ((W)) \ && !(W)->pseudo_window_p \ - && FRAME_WANTS_MODELINE_P (XFRAME (WINDOW_FRAME (W))) \ + && FRAME_WANTS_MODELINE_P (XFRAME (WINDOW_FRAME ((W)))) \ && BUFFERP ((W)->buffer) \ - && !NILP (XBUFFER ((W)->buffer)->mode_line_format)) + && !NILP (XBUFFER ((W)->buffer)->mode_line_format) \ + && (W)->height > 1) /* Value is non-zero if window W wants a header line. */ #define WINDOW_WANTS_HEADER_LINE_P(W) \ - (!MINI_WINDOW_P (W) \ + (!MINI_WINDOW_P ((W)) \ && !(W)->pseudo_window_p \ - && FRAME_WANTS_MODELINE_P (XFRAME (WINDOW_FRAME (W))) \ + && FRAME_WANTS_MODELINE_P (XFRAME (WINDOW_FRAME ((W)))) \ && BUFFERP ((W)->buffer) \ - && !NILP (XBUFFER ((W)->buffer)->header_line_format)) + && !NILP (XBUFFER ((W)->buffer)->header_line_format) \ + && (W)->height > 1 + !NILP (XBUFFER ((W)->buffer)->mode_line_format)) /***********************************************************************