From 7c41dcde1c65969702b31b3e65df175984111901 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 23 Jun 2023 13:47:05 +0300 Subject: [PATCH] Revert "; * src/window.c (window_wants_header_line): Shut up bogus GCC warning." This reverts commit ef8485ad05dd9200b68ea8141fd44c7b976140cd. This is part of removing the recently-added feature whereby certain non-nil values of 'header-line-format' could signal that the header line shall not be displayed. The feature is being reverted because its advantages are very minor, whereas the complications it causes are serious. --- src/window.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/window.c b/src/window.c index e56dad63a70..801da24ffbf 100644 --- a/src/window.c +++ b/src/window.c @@ -5533,14 +5533,13 @@ window_wants_header_line (struct window *w) = window_parameter (w, Qheader_line_format); struct frame *f = WINDOW_XFRAME (w); - Lisp_Object wbuffer = WINDOW_BUFFER (w); - return (BUFFERP (wbuffer) + return (WINDOW_LEAF_P (w) && !MINI_WINDOW_P (w) && !WINDOW_PSEUDO_P (w) && !EQ (window_header_line_format, Qnone) && (!null_header_line_format (window_header_line_format, f) - || !null_header_line_format (BVAR (XBUFFER (wbuffer), + || !null_header_line_format (BVAR (XBUFFER (WINDOW_BUFFER (w)), header_line_format), f)) && (WINDOW_PIXEL_HEIGHT (w) > (window_wants_mode_line (w) -- 2.39.2