mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-02 10:11:05 -08:00
Code Issues Projects Releases Wiki Activity

; Fix last change

Browse source 
* src/window.c (window_wants_header_line): Fix whitespace and
commentary in last change.  (Bug#63825)
This commit is contained in:
Eli Zaretskii 2023-06-06 15:15:34 +03:00
parent 4f66cbbfe5
commit 05c2be28a3
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/window.c
View file

@ -5475,14 +5475,14 @@ window_wants_mode_line (struct window *w)
* null_header_line_format:
*
* Return non-zero when header line format FMT indicates that the
* header line should not be displayed at all.
* header line should not be displayed at all, for windows on frame F.
*
* This is when FMT is nil, or if FMT is a cons cell and either its
* car is a symbol whose value as a variable is nil or void, or its
* car is the symbol ':eval' and its cadr evaluates to nil.
*/
static bool
null_header_line_format (Lisp_Object fmt, struct frame * f)
null_header_line_format (Lisp_Object fmt, struct frame *f)
{
Lisp_Object car;
Lisp_Object val;
@ -5533,7 +5533,7 @@ window_wants_header_line (struct window *w)
Lisp_Object window_header_line_format =
window_parameter (w, Qheader_line_format);
struct frame * f = WINDOW_XFRAME(w);
struct frame *f = WINDOW_XFRAME(w);
return (WINDOW_LEAF_P (w)
&& !MINI_WINDOW_P (w)
@ -5541,8 +5541,7 @@ window_wants_header_line (struct window *w)
&& !EQ (window_header_line_format, Qnone)
&& (!null_header_line_format (window_header_line_format, f)
|| !null_header_line_format (BVAR (XBUFFER (WINDOW_BUFFER (w)),
header_line_format),
f))
header_line_format), f))
&& (WINDOW_PIXEL_HEIGHT (w)
> (window_wants_mode_line (w)
? 2 * WINDOW_FRAME_LINE_HEIGHT (w)