From: Kim F. Storm <storm@cua.dk>
Date: Sat, 28 Feb 2004 01:02:16 +0000 (+0000)
Subject: (update_window): Update header line also if there are
X-Git-Tag: ttn-vms-21-2-B4~7437
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=52d2d88abfb5cdcf2d7549e81d75bc9cc5b620f3;p=emacs.git

(update_window): Update header line also if there are
no other changes in window (move code after set_cursor label).
---

diff --git a/src/dispnew.c b/src/dispnew.c
index 4e4b9c56a8d..e1a3ed93dab 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -4135,16 +4135,6 @@ update_window (w, force_p)
 	  changed_p = 1;
 	}
 
-      /* Update the header line after scrolling because a new header
-	 line would otherwise overwrite lines at the top of the window
-	 that can be scrolled.  */
-      if (header_line_row && header_line_row->enabled_p)
-	{
-	  header_line_row->y = 0;
-	  update_window_line (w, 0, &mouse_face_overwritten_p);
-	  changed_p = 1;
-	}
-
       /* Update the rest of the lines.  */
       for (n_updated = 0; row < end && (force_p || !input_pending); ++row)
 	if (row->enabled_p)
@@ -4181,6 +4171,16 @@ update_window (w, force_p)
 
     set_cursor:
 
+      /* Update the header line after scrolling because a new header
+	 line would otherwise overwrite lines at the top of the window
+	 that can be scrolled.  */
+      if (header_line_row && header_line_row->enabled_p)
+	{
+	  header_line_row->y = 0;
+	  update_window_line (w, 0, &mouse_face_overwritten_p);
+	  changed_p = 1;
+	}
+
       /* Fix the appearance of overlapping/overlapped rows.  */
       if (!paused_p && !w->pseudo_window_p)
 	{