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

This commit is contained in:
Po Lu 2023-06-06 21:06:16 +08:00
commit 34391d6675

View file

@ -5533,10 +5533,10 @@ null_header_line_format (Lisp_Object fmt, struct frame *f)
bool
window_wants_header_line (struct window *w)
{
Lisp_Object window_header_line_format =
window_parameter (w, Qheader_line_format);
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)