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

[Po Lu]

branch: feature/android
commit 9a68041f2ccb07c2baf9cf6e1075243706f73b82
Merge: 8b102bf6067 ef8485ad05d
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Merge remote-tracking branch 'origin/master' into feature/android
---
 src/window.c | 5 +++--
 1 file 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)