feature/android 34391d66757 2/3: Merge remote-tracking branch 'origin/master' into feature/android

[Po Lu]

branch: feature/android
commit 34391d66757c8a1f197947156d7c3f07fa2ffa96
Merge: 1263531b9a2 229f0b8dd3b
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Merge remote-tracking branch 'origin/master' into feature/android
---
 src/window.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/window.c b/src/window.c
index 6423060b985..27ca0fbc694 100644
--- a/src/window.c
+++ b/src/window.c
@@ -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)