[Emacs-diffs] /srv/bzr/emacs/trunk r106250: Fix random crashes while scrolling backwards.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106250
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2011-10-30 20:07:48 +0200
message:
  Fix random crashes while scrolling backwards.
  
   src/xdisp.c (try_cursor_movement): Make sure ROW isn't decremented
   past the beginning of the current glyph matrix.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-10-30 18:04:13 +0000
+++ b/src/ChangeLog     2011-10-30 18:07:48 +0000
@@ -1,3 +1,8 @@
+2011-10-30  Eli Zaretskii  <address@hidden>
+
+       * xdisp.c (try_cursor_movement): Make sure ROW isn't decremented
+       past the beginning of the current glyph matrix.
+
 2011-10-30  Adam Sjøgren <address@hidden> (tiny change)
 
        * xterm.c: Include X11/Xproto.h if HAVE_GTK3.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-10-29 10:02:39 +0000
+++ b/src/xdisp.c       2011-10-30 18:07:48 +0000
@@ -14829,8 +14829,6 @@
                 bidi-reordered rows.  */
              while (MATRIX_ROW_CONTINUATION_LINE_P (row))
                {
-                 xassert (row->enabled_p);
-                 --row;
                  /* If we hit the beginning of the displayed portion
                     without finding the first row of a continued
                     line, give up.  */
@@ -14839,7 +14837,8 @@
                      rc = CURSOR_MOVEMENT_MUST_SCROLL;
                      break;
                    }
-
+                 xassert (row->enabled_p);
+                 --row;
                }
            }
          if (must_scroll)