1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-02 11:50:48 -08:00

Fix vertical cursor motion under bidi on auto-composed characters.

src/xdisp.c (BUFFER_POS_REACHED_P): If this is a composition,
 consider it a hit if to_charpos is anywhere in the range of the
 composed buffer positions.
This commit is contained in:
Eli Zaretskii 2011-08-22 20:00:40 +03:00
parent 4d993e7b54
commit dac347dd4a
2 changed files with 12 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2011-08-22 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (BUFFER_POS_REACHED_P): If this is a composition,
consider it a hit if to_charpos is anywhere in the range of the
composed buffer positions.
2011-08-22 Chong Yidong <cyd@stupidchicken.com>
* image.c (gif_load): Don't assume that each subimage has the same

View file

@ -7699,7 +7699,12 @@ move_it_in_display_line_to (struct it *it,
((op & MOVE_TO_POS) != 0 \
&& BUFFERP (it->object) \
&& (IT_CHARPOS (*it) == to_charpos \
|| (!it->bidi_p && IT_CHARPOS (*it) > to_charpos)) \
|| (!it->bidi_p && IT_CHARPOS (*it) > to_charpos) \
|| (it->what == IT_COMPOSITION \
&& ((IT_CHARPOS (*it) > to_charpos \
&& to_charpos >= it->cmp_it.charpos) \
|| (IT_CHARPOS (*it) < to_charpos \
&& to_charpos <= it->cmp_it.charpos)))) \
&& (it->method == GET_FROM_BUFFER \
|| (it->method == GET_FROM_DISPLAY_VECTOR \
&& it->dpvec + it->current.dpvec_index + 1 >= it->dpend)))