Mercurial > emacs
changeset 97828:5a501b4092a0
(adjust_point_for_property): Check composition by
composition_adjust_point.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 29 Aug 2008 07:56:40 +0000 |
| parents | 36198ccea250 |
| children | 99a0b68bcc29 |
| files | src/keyboard.c |
| diffstat | 1 files changed, 3 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/keyboard.c Fri Aug 29 07:56:25 2008 +0000 +++ b/src/keyboard.c Fri Aug 29 07:56:40 2008 +0000 @@ -1994,13 +1994,9 @@ /* FIXME: check `intangible'. */ if (check_composition && PT > BEGV && PT < ZV - && get_property_and_range (PT, Qcomposition, &val, &beg, &end, Qnil) - && COMPOSITION_VALID_P (beg, end, val) - && beg < PT /* && end > PT <- It's always the case. */ - && (last_pt <= beg || last_pt >= end)) - { - xassert (end > PT); - SET_PT (PT < last_pt ? beg : end); + && (beg = composition_adjust_point (last_pt)) != PT) + { + SET_PT (beg); check_display = check_invisible = 1; } check_composition = 0;