[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r106357: dispnew.c (scrolling_window)
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r106357: dispnew.c (scrolling_window): Fix index usage. |
Date: |
Sat, 12 Nov 2011 12:09:38 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 106357
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2011-11-12 12:09:38 +0200
message:
dispnew.c (scrolling_window): Fix index usage.
src/dispnew.c (scrolling_window): Fix incorrect indices in accessing
current_matrix and desired_matrix. (Bug#9990)
modified:
src/ChangeLog
src/dispnew.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-11-12 09:55:50 +0000
+++ b/src/ChangeLog 2011-11-12 10:09:38 +0000
@@ -1,3 +1,8 @@
+2011-11-12 Eli Zaretskii <address@hidden>
+
+ * dispnew.c (scrolling_window): Fix incorrect indices in accessing
+ current_matrix and desired_matrix. (Bug#9990)
+
2011-11-12 Martin Rudalics <address@hidden>
* window.h (window): Remove splits slot.
=== modified file 'src/dispnew.c'
--- a/src/dispnew.c 2011-10-08 10:58:50 +0000
+++ b/src/dispnew.c 2011-11-12 10:09:38 +0000
@@ -4334,10 +4334,10 @@
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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r106357: dispnew.c (scrolling_window): Fix index usage.,
Eli Zaretskii <=