aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2000-07-12 16:00:36 +0000
committerGerd Moellmann2000-07-12 16:00:36 +0000
commitd8ee78037a119624679d32703b8d47444e10a746 (patch)
tree343cad3274a16eb69fcc3057a31ae0a9a85f5967 /src
parent60c7ff3b9d9f60d5b19dc1e688092430555b12e9 (diff)
downloademacs-d8ee78037a119624679d32703b8d47444e10a746.tar.gz
emacs-d8ee78037a119624679d32703b8d47444e10a746.zip
(redraw_overlapped_rows): Add missing local.
(scrolling_window): Remove debug code.
Diffstat (limited to 'src')
-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 @@
12000-07-12 Gerd Moellmann <gerd@gnu.org> 12000-07-12 Gerd Moellmann <gerd@gnu.org>
2 2
3 * dispnew.c (redraw_overlapped_rows): Add missing local.
4 (scrolling_window): Remove debug code.
5
3 * xdisp.c (try_window_reusing_current_matrix, try_window_id): 6 * xdisp.c (try_window_reusing_current_matrix, try_window_id):
4 Before scrolling, turn off a mouse-highlight in the window 7 Before scrolling, turn off a mouse-highlight in the window
5 being scrolled. 8 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)
3638 struct window *w; 3638 struct window *w;
3639 int yb; 3639 int yb;
3640{ 3640{
3641 int i;
3642
3641 /* If rows overlapping others have been changed, the rows being 3643 /* If rows overlapping others have been changed, the rows being
3642 overlapped have to be redrawn. This won't draw lines that have 3644 overlapped have to be redrawn. This won't draw lines that have
3643 already been drawn in update_window_line because overlapped_p in 3645 already been drawn in update_window_line because overlapped_p in
@@ -4638,7 +4640,6 @@ scrolling_window (w, header_line_p)
4638 to = MATRIX_ROW (current_matrix, r->desired_vpos + j); 4640 to = MATRIX_ROW (current_matrix, r->desired_vpos + j);
4639 from = MATRIX_ROW (desired_matrix, r->desired_vpos + j); 4641 from = MATRIX_ROW (desired_matrix, r->desired_vpos + j);
4640 to_overlapped_p = to->overlapped_p; 4642 to_overlapped_p = to->overlapped_p;
4641 xassert (!to->mouse_face_p);
4642 assign_row (to, from); 4643 assign_row (to, from);
4643 to->enabled_p = 1, from->enabled_p = 0; 4644 to->enabled_p = 1, from->enabled_p = 0;
4644 to->overlapped_p = to_overlapped_p; 4645 to->overlapped_p = to_overlapped_p;