(update_window): Don't skip the header-line

update when scrolling_window returns 0.

diff --git a/src/ChangeLog b/src/ChangeLog
index baf6f5404e62893492130d750f7ace21cc79c5e6..c028075d5610fcbbe3b0596a79c02ae5c82c757e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,9 +1,12 @@
 2001-07-10  Gerd Moellmann  <gerd@gnu.org>
 
+       * dispnew.c (update_window): Don't skip the header-line 
+       update when scrolling_window returns 0.
+
        * xfaces.c (unload_color): Do nothing if PIXEL is -1.
 
        * xfns.c (Fx_create_frame): Initialize frame colors to -1,
-       for the case that x_decode_colors signals an error.
+       for the case that x_decode_color signals an error.
 
        * xdisp.c (add_to_log): Do nothing if called asynchronously.
 

diff --git a/src/dispnew.c b/src/dispnew.c
index 412d59939562bbb106647be6d5e8cfd606e25028..30dad7b5cb89479ba498d95c85ceaa29f74a62a5 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -4085,18 +4085,8 @@ update_window (w, force_p)
       
       /* Try reusing part of the display by copying.  */
       if (row < end && !desired_matrix->no_scrolling_p)
-       {
-         int rc = scrolling_window (w, header_line_row != NULL);
-         if (rc < 0)
-           {
-             /* All rows were found to be equal.  */
-             paused_p = 0;
-             goto set_cursor;
-           }
-         else if (rc > 0)
-           force_p = 1;
-         changed_p = 1;
-       }
+       if (scrolling_window (w, header_line_row != NULL) > 0)
+         force_p = changed_p = 1;
 
       /* Update the top mode line after scrolling because a new top
         line would otherwise overwrite lines at the top of the window
@@ -4142,8 +4132,6 @@ update_window (w, force_p)
       /* Was display preempted?  */
       paused_p = row < end;
       
-    set_cursor:
-      
       /* Fix the appearance of overlapping(overlapped rows.  */
       if (!paused_p && !w->pseudo_window_p)
        {