Mercurial > emacs
changeset 107993:7a57ff6ef75c
Fix two crashes with display of R2L lines in GUI sessions.
xdisp.c (next_element_from_buffer): Don't call
bidi_paragraph_init if we are at ZV. Fixes a crash when reseated to
ZV by try_window_reusing_current_matrix.
(display_and_set_cursor, erase_phys_cursor): Handle negative HPOS,
which happens with R2L glyph rows. Fixes a crash when inserting a
character at end of an R2L line.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 17 Apr 2010 13:29:40 +0300 |
| parents | 27128322dda6 |
| children | 5dc04900cbd7 |
| files | src/ChangeLog src/xdisp.c |
| diffstat | 2 files changed, 19 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Apr 17 12:46:44 2010 +0300 +++ b/src/ChangeLog Sat Apr 17 13:29:40 2010 +0300 @@ -1,5 +1,12 @@ 2010-04-17 Eli Zaretskii <eliz@gnu.org> + * xdisp.c (next_element_from_buffer): Don't call + bidi_paragraph_init if we are at ZV. Fixes a crash when reseated to + ZV by try_window_reusing_current_matrix. + (display_and_set_cursor, erase_phys_cursor): Handle negative HPOS, + which happens with R2L glyph rows. Fixes a crash when inserting a + character at end of an R2L line. + Continue work on R2L paragraphs in GUI sessions. * xdisp.c (set_cursor_from_row): Don't be fooled by truncated
--- a/src/xdisp.c Sat Apr 17 12:46:44 2010 +0300 +++ b/src/xdisp.c Sat Apr 17 13:29:40 2010 +0300 @@ -6635,13 +6635,20 @@ { it->bidi_it.charpos = IT_CHARPOS (*it); it->bidi_it.bytepos = IT_BYTEPOS (*it); - /* If we are at the beginning of a line, we can produce the next - element right away. */ - if (it->bidi_it.bytepos == BEGV_BYTE + if (it->bidi_it.bytepos == ZV_BYTE) + { + /* Nothing to do, but reset the FIRST_ELT flag, like + bidi_paragraph_init does, because we are not going to + call it. */ + it->bidi_it.first_elt = 0; + } + else if (it->bidi_it.bytepos == BEGV_BYTE /* FIXME: Should support all Unicode line separators. */ || FETCH_CHAR (it->bidi_it.bytepos - 1) == '\n' || FETCH_CHAR (it->bidi_it.bytepos) == '\n') { + /* If we are at the beginning of a line, we can produce the + next element right away. */ bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it); bidi_get_next_char_visually (&it->bidi_it); } @@ -23448,7 +23455,7 @@ /* Don't redraw the cursor's spot in mouse face if it is at the end of a line (on a newline). The cursor appears there, but mouse highlighting does not. */ - && cursor_row->used[TEXT_AREA] > hpos) + && cursor_row->used[TEXT_AREA] > hpos && hpos >= 0) mouse_face_here_p = 1; /* Maybe clear the display under the cursor. */ @@ -23530,7 +23537,7 @@ glyph = NULL; if (!glyph_row->exact_window_width_line_p - || hpos < glyph_row->used[TEXT_AREA]) + || (0 <= hpos && hpos < glyph_row->used[TEXT_AREA])) glyph = glyph_row->glyphs[TEXT_AREA] + hpos; xassert (interrupt_input_blocked);