(redraw_overlapped_rows): Add missing local.

(scrolling_window): Remove debug code.

diff --git a/src/ChangeLog b/src/ChangeLog
index f9e7e1fda8c1556dd07375418a7943cd6f398aaf..99c6bce5c87d9d8a051cad8a2381c7cc6e85968c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2000-07-12  Gerd Moellmann  <gerd@gnu.org>
 
+       * dispnew.c (redraw_overlapped_rows): Add missing local.
+       (scrolling_window): Remove debug code.
+
        * xdisp.c (try_window_reusing_current_matrix, try_window_id):
        Before scrolling, turn off a mouse-highlight in the window
        being scrolled.

diff --git a/src/dispnew.c b/src/dispnew.c
index 28ba65458c868ad22fc477f5d07820a0ba769403..f0d7d3ea6dcbde68b4961f0931e38bfd1c7d309b 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3638,6 +3638,8 @@ redraw_overlapped_rows (w, yb)
      struct window *w;
      int yb;
 {
+  int i;
+  
   /* If rows overlapping others have been changed, the rows being
      overlapped have to be redrawn.  This won't draw lines that have
      already been drawn in update_window_line because overlapped_p in
@@ -4638,7 +4640,6 @@ scrolling_window (w, header_line_p)
            to = MATRIX_ROW (current_matrix, r->desired_vpos + j);
            from = MATRIX_ROW (desired_matrix, r->desired_vpos + j);
            to_overlapped_p = to->overlapped_p;
-           xassert (!to->mouse_face_p);
            assign_row (to, from);
            to->enabled_p = 1, from->enabled_p = 0;
            to->overlapped_p = to_overlapped_p;