Fix crash with bidi display on the last empty line (bug#6030).

 xdisp.c (display_line): Don't assume 2nd call to
 get_next_display_element cannot return zero.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7561d6ebf61a652fad24d111610a544a56822ebc..8b1c81261cca31eff5db23a480cd959aff2b6c41 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-25  Eli Zaretskii  <eliz@gnu.org>
+
+       * xdisp.c (display_line): Fix crash with bidi display on the last
+       empty line.  (Bug#6030)
+
 2010-04-24  Eli Zaretskii  <eliz@gnu.org>
 
        * xdisp.c (display_line): Use `reseat' instead of `reseat_1', and

diff --git a/src/xdisp.c b/src/xdisp.c
index 5e5684a845d573ba8a5ce93333b824c6e99c1568..3282c42f2a7206f61241eeb2da2fd49987301cf5 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17979,9 +17979,8 @@ display_line (it)
          row_end = it->current;
          /* If the character at max_pos+1 is a newline, skip that as
             well.  Note that this may skip some invisible text.  */
-         if (!get_next_display_element (it))
-           abort ();
-         if (ITERATOR_AT_END_OF_LINE_P (it))
+         if (get_next_display_element (it)
+             && ITERATOR_AT_END_OF_LINE_P (it))
            {
              set_iterator_to_next (it, 1);
              /* Record the position after the newline of a continued