summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog3
-rw-r--r--src/dispnew.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f9e7e1fda8c..99c6bce5c87 100644
--- 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 28ba65458c8..f0d7d3ea6dc 100644
--- 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;