Mercurial > emacs
changeset 108111:69bfc9e4ceb6
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.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sun, 25 Apr 2010 17:42:34 +0300 |
| parents | 882652fb64a7 |
| children | a9a653a56eef |
| files | src/ChangeLog src/xdisp.c |
| diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Apr 24 14:07:27 2010 +0300 +++ b/src/ChangeLog Sun Apr 25 17:42:34 2010 +0300 @@ -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
--- a/src/xdisp.c Sat Apr 24 14:07:27 2010 +0300 +++ b/src/xdisp.c Sun Apr 25 17:42:34 2010 +0300 @@ -17979,9 +17979,8 @@ 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