aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
authorEli Zaretskii2023-06-06 15:15:34 +0300
committerEli Zaretskii2023-06-06 15:15:34 +0300
commit05c2be28a3e97bd920d0bf8c8b59ec682a420cce (patch)
tree1ae1c192a886a54b27506df99353f9d8ea6e2a10 /src/window.c
parent4f66cbbfe520ee31ef26676e09a926217d9736fe (diff)
downloademacs-05c2be28a3e97bd920d0bf8c8b59ec682a420cce.tar.gz
emacs-05c2be28a3e97bd920d0bf8c8b59ec682a420cce.zip
; Fix last change
* src/window.c (window_wants_header_line): Fix whitespace and commentary in last change. (Bug#63825)
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/window.c b/src/window.c
index 9429679061e..7d89885b65f 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5475,14 +5475,14 @@ window_wants_mode_line (struct window *w)
5475 * null_header_line_format: 5475 * null_header_line_format:
5476 * 5476 *
5477 * Return non-zero when header line format FMT indicates that the 5477 * Return non-zero when header line format FMT indicates that the
5478 * header line should not be displayed at all. 5478 * header line should not be displayed at all, for windows on frame F.
5479 * 5479 *
5480 * This is when FMT is nil, or if FMT is a cons cell and either its 5480 * This is when FMT is nil, or if FMT is a cons cell and either its
5481 * car is a symbol whose value as a variable is nil or void, or its 5481 * car is a symbol whose value as a variable is nil or void, or its
5482 * car is the symbol ':eval' and its cadr evaluates to nil. 5482 * car is the symbol ':eval' and its cadr evaluates to nil.
5483 */ 5483 */
5484static bool 5484static bool
5485null_header_line_format (Lisp_Object fmt, struct frame * f) 5485null_header_line_format (Lisp_Object fmt, struct frame *f)
5486{ 5486{
5487 Lisp_Object car; 5487 Lisp_Object car;
5488 Lisp_Object val; 5488 Lisp_Object val;
@@ -5533,7 +5533,7 @@ window_wants_header_line (struct window *w)
5533 Lisp_Object window_header_line_format = 5533 Lisp_Object window_header_line_format =
5534 window_parameter (w, Qheader_line_format); 5534 window_parameter (w, Qheader_line_format);
5535 5535
5536 struct frame * f = WINDOW_XFRAME(w); 5536 struct frame *f = WINDOW_XFRAME(w);
5537 5537
5538 return (WINDOW_LEAF_P (w) 5538 return (WINDOW_LEAF_P (w)
5539 && !MINI_WINDOW_P (w) 5539 && !MINI_WINDOW_P (w)
@@ -5541,8 +5541,7 @@ window_wants_header_line (struct window *w)
5541 && !EQ (window_header_line_format, Qnone) 5541 && !EQ (window_header_line_format, Qnone)
5542 && (!null_header_line_format (window_header_line_format, f) 5542 && (!null_header_line_format (window_header_line_format, f)
5543 || !null_header_line_format (BVAR (XBUFFER (WINDOW_BUFFER (w)), 5543 || !null_header_line_format (BVAR (XBUFFER (WINDOW_BUFFER (w)),
5544 header_line_format), 5544 header_line_format), f))
5545 f))
5546 && (WINDOW_PIXEL_HEIGHT (w) 5545 && (WINDOW_PIXEL_HEIGHT (w)
5547 > (window_wants_mode_line (w) 5546 > (window_wants_mode_line (w)
5548 ? 2 * WINDOW_FRAME_LINE_HEIGHT (w) 5547 ? 2 * WINDOW_FRAME_LINE_HEIGHT (w)