procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into feature/android

Browse source
This commit is contained in:
Po Lu 2023-06-07 07:28:00 +08:00
commit 9a68041f2c
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/window.c
View file

@ -5537,13 +5537,14 @@ 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 (WINDOW_LEAF_P (w)
return (BUFFERP (wbuffer)
&& !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 (WINDOW_BUFFER (w)),
|| !null_header_line_format (BVAR (XBUFFER (wbuffer),
header_line_format), f))
&& (WINDOW_PIXEL_HEIGHT (w)
> (window_wants_mode_line (w)