Mercurial > emacs
changeset 108833:14bdecf19b8c
Fix crash reported in bug #6306.
bidi.c (bidi_move_to_visually_next): Make sure the sentinel
state is always cached.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sun, 30 May 2010 22:01:51 +0300 |
| parents | d901ae131f55 |
| children | 91c7e7b1d29a |
| files | src/ChangeLog src/bidi.c |
| diffstat | 2 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun May 30 20:52:56 2010 +0200 +++ b/src/ChangeLog Sun May 30 22:01:51 2010 +0300 @@ -1,3 +1,8 @@ +2010-05-30 Eli Zaretskii <eliz@gnu.org> + + * bidi.c (bidi_move_to_visually_next): Make sure the sentinel + state is always cached (bug#6306). + 2010-05-29 Eli Zaretskii <eliz@gnu.org> Fix cursor motion in bidi-reordered continued lines.
--- a/src/bidi.c Sun May 30 20:52:56 2010 +0200 +++ b/src/bidi.c Sun May 30 22:01:51 2010 +0300 @@ -1907,7 +1907,9 @@ if (!bidi_it->first_elt && bidi_it->orig_type == NEUTRAL_B) bidi_line_init (bidi_it); - /* Prepare the sentinel iterator state. */ + /* Prepare the sentinel iterator state, and cache it. When we bump + into it, scanning backwards, we'll know that the last non-base + level is exhausted. */ if (bidi_cache_idx == 0) { bidi_copy_it (&sentinel, bidi_it); @@ -1918,6 +1920,7 @@ sentinel.ch = '\n'; /* doesn't matter, but why not? */ sentinel.ch_len = 1; } + bidi_cache_iterator_state (&sentinel, 1); } old_level = bidi_it->resolved_level; @@ -1933,11 +1936,6 @@ int incr = ascending ? 1 : -1; int expected_next_level = old_level + incr; - /* If we don't have anything cached yet, we need to cache the - sentinel state, since we'll need it to record where to jump - when the last non-base level is exhausted. */ - if (bidi_cache_idx == 0) - bidi_cache_iterator_state (&sentinel, 1); /* Jump (or walk) to the other edge of this level. */ bidi_find_other_level_edge (bidi_it, level_to_search, !ascending); /* Switch scan direction and peek at the next character in the