diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-06-07 07:28:00 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-06-07 07:28:00 +0800 |
| commit | 9a68041f2ccb07c2baf9cf6e1075243706f73b82 (patch) | |
| tree | cd58dcc2c5a5dfca6e5c501b56d810f8ba023fd3 /src/window.c | |
| parent | 8b102bf6067b59f6ca56d464d866404cde36b8e5 (diff) | |
| parent | ef8485ad05dd9200b68ea8141fd44c7b976140cd (diff) | |
| download | emacs-9a68041f2ccb07c2baf9cf6e1075243706f73b82.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/android
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c index 27ca0fbc694..5f5eb30782c 100644 --- a/src/window.c +++ b/src/window.c @@ -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) |