From: Kenichi Handa <handa@m17n.org>
Date: Fri, 29 Aug 2008 07:56:40 +0000 (+0000)
Subject: (adjust_point_for_property): Check composition by
X-Git-Tag: emacs-pretest-23.0.90~3171
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=db2f2cdcb9a475a683458f1ecf3dfa4326346811;p=emacs.git

(adjust_point_for_property): Check composition by
composition_adjust_point.
---

diff --git a/src/keyboard.c b/src/keyboard.c
index 9650b574ccf..e957e7e5c8f 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1994,13 +1994,9 @@ adjust_point_for_property (last_pt, modified)
       /* 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))
+	  && (beg = composition_adjust_point (last_pt)) != PT)
 	{
-	  xassert (end > PT);
-	  SET_PT (PT < last_pt ? beg : end);
+	  SET_PT (beg);
 	  check_display = check_invisible = 1;
 	}
       check_composition = 0;