1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-20 10:23:57 +00:00

dispnew.c (scrolling_window): Fix index usage.

src/dispnew.c (scrolling_window): Fix incorrect indices in accessing
 current_matrix and desired_matrix.  (Bug#9990)
This commit is contained in:
Eli Zaretskii 2011-11-12 12:09:38 +02:00
parent 89d612214e
commit 1e5b2111b6
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2011-11-12 Eli Zaretskii <eliz@gnu.org>
* dispnew.c (scrolling_window): Fix incorrect indices in accessing
current_matrix and desired_matrix. (Bug#9990)
2011-11-12 Martin Rudalics <rudalics@gmx.at>
* window.h (window): Remove splits slot.

View File

@ -4334,10 +4334,10 @@ scrolling_window (struct window *w, int header_line_p)
j = last_old;
while (i - 1 > first_new
&& j - 1 > first_old
&& MATRIX_ROW (current_matrix, i - 1)->enabled_p
&& (MATRIX_ROW (current_matrix, i - 1)->y
== MATRIX_ROW (desired_matrix, j - 1)->y)
&& !MATRIX_ROW (desired_matrix, j - 1)->redraw_fringe_bitmaps_p
&& MATRIX_ROW (current_matrix, j - 1)->enabled_p
&& (MATRIX_ROW (current_matrix, j - 1)->y
== MATRIX_ROW (desired_matrix, i - 1)->y)
&& !MATRIX_ROW (desired_matrix, i - 1)->redraw_fringe_bitmaps_p
&& row_equal_p (MATRIX_ROW (desired_matrix, i - 1),
MATRIX_ROW (current_matrix, j - 1), 1))
--i, --j;