[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100632: Backport Bug#9990 fix from trunk

[Chong Yidong]

------------------------------------------------------------
revno: 100632
author: Eli Zaretskii <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Mon 2012-01-09 17:13:27 +0800
message:
  Backport Bug#9990 fix from trunk
  
  * 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-10-31 03:08:54 +0000
+++ b/src/ChangeLog     2012-01-09 09:13:27 +0000
@@ -1,3 +1,8 @@
+2012-01-09  Eli Zaretskii  <address@hidden>
+
+       * dispnew.c (scrolling_window): Fix incorrect indices in accessing
+       current_matrix and desired_matrix.  (Bug#9990)
+
 2011-10-31  YAMAMOTO Mitsuharu  <address@hidden>
 
        * xmenu.c (cleanup_widget_value_tree): New function.

=== modified file 'src/dispnew.c'
--- a/src/dispnew.c     2011-06-18 00:37:38 +0000
+++ b/src/dispnew.c     2012-01-09 09:13:27 +0000
@@ -5035,10 +5035,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 (w,
                         MATRIX_ROW (desired_matrix, i - 1),
                          MATRIX_ROW (current_matrix, j - 1), 1))