emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 05c2be28a3e 2/2: ; Fix last change


From: Eli Zaretskii
Subject: master 05c2be28a3e 2/2: ; Fix last change
Date: Tue, 6 Jun 2023 08:16:08 -0400 (EDT)

branch: master
commit 05c2be28a3e97bd920d0bf8c8b59ec682a420cce
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    ; Fix last change
    
    * src/window.c (window_wants_header_line): Fix whitespace and
    commentary in last change.  (Bug#63825)
---
 src/window.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/window.c b/src/window.c
index 9429679061e..7d89885b65f 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5475,14 +5475,14 @@ window_wants_mode_line (struct window *w)
  * null_header_line_format:
  *
  * Return non-zero when header line format FMT indicates that the
- * header line should not be displayed at all.
+ * header line should not be displayed at all, for windows on frame F.
  *
  * This is when FMT is nil, or if FMT is a cons cell and either its
  * car is a symbol whose value as a variable is nil or void, or its
  * car is the symbol ':eval' and its cadr evaluates to nil.
  */
 static bool
-null_header_line_format (Lisp_Object fmt, struct frame * f)
+null_header_line_format (Lisp_Object fmt, struct frame *f)
 {
   Lisp_Object car;
   Lisp_Object val;
@@ -5533,7 +5533,7 @@ window_wants_header_line (struct window *w)
   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)
@@ -5541,8 +5541,7 @@ window_wants_header_line (struct window *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)),
-                                                header_line_format),
-                                          f))
+                                                header_line_format), f))
          && (WINDOW_PIXEL_HEIGHT (w)
              > (window_wants_mode_line (w)
                 ? 2 * WINDOW_FRAME_LINE_HEIGHT (w)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]