# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1219996600 0
# Node ID 5a501b4092a0a1136075866579229c3020d86496
# Parent  36198ccea25010a80716549a503688fc837c7689
(adjust_point_for_property): Check composition by
composition_adjust_point.

diff -r 36198ccea250 -r 5a501b4092a0 src/keyboard.c
--- 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;