[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107792: Fix bug #11199 with killing a line at EOB that was bidi-reordered.

[Eli Zaretskii]

------------------------------------------------------------
revno: 107792
fixes bug(s): http://debbugs.gnu.org/11199
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Mon 2012-04-09 15:28:45 +0300
message:
  Fix bug #11199 with killing a line at EOB that was bidi-reordered.
  
   src/xdisp.c (find_last_unchanged_at_beg_row): Don't consider a row
   "unchanged" if its end.pos is beyond ZV.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-04-09 10:01:04 +0000
+++ b/src/ChangeLog     2012-04-09 12:28:45 +0000
@@ -1,3 +1,8 @@
+2012-04-09  Eli Zaretskii  <address@hidden>
+
+       * xdisp.c (find_last_unchanged_at_beg_row): Don't consider a row
+       "unchanged" if its end.pos is beyond ZV.  (Bug#11199)
+
 2012-04-09  Jan Djärv  <address@hidden>
 
        * nsterm.m (constrainFrameRect): Always constrain when there is only

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-03-31 19:30:53 +0000
+++ b/src/xdisp.c       2012-04-09 12:28:45 +0000
@@ -16602,7 +16602,15 @@
             continued.  */
          && !(MATRIX_ROW_END_CHARPOS (row) == first_changed_pos
               && (row->continued_p
-                  || row->exact_window_width_line_p)))
+                  || row->exact_window_width_line_p))
+         /* If ROW->end is beyond ZV, then ROW->end is outdated and
+            needs to be recomputed, so don't consider this row as
+            unchanged.  This happens when the last line was
+            bidi-reordered and was killed immediately before this
+            redisplay cycle.  In that case, ROW->end stores the
+            buffer position of the first visual-order character of
+            the next row, which is now beyond ZV.  */
+         && CHARPOS (row->end.pos) <= ZV)
        row_found = row;
 
       /* Stop if last visible row.  */