# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1181865637 0
# Node ID f6d5dccc38c9a496b2db82182321b3730ad15c7c
# Parent  e4ab8593855288828b968baf203c9d6cfa92bcfb
(update_compositions): Check validity of compositions.

diff -r e4ab85938552 -r f6d5dccc38c9 src/composite.c
--- a/src/composite.c	Thu Jun 14 23:59:17 2007 +0000
+++ b/src/composite.c	Fri Jun 15 00:00:37 2007 +0000
@@ -500,7 +500,8 @@
 	 avoid it, in such a case, we change the property of the
 	 latter to the copy of it.  */
       if (from > BEGV
-	  && find_composition (from - 1, -1, &start, &end, &prop, Qnil))
+	  && find_composition (from - 1, -1, &start, &end, &prop, Qnil)
+	  && COMPOSITION_VALID_P (start, end, prop))
 	{
 	  if (from < end)
 	    Fput_text_property (make_number (from), make_number (end),
@@ -510,7 +511,8 @@
 	  from = end;
 	}
       else if (from < ZV
-	       && find_composition (from, -1, &start, &from, &prop, Qnil))
+	       && find_composition (from, -1, &start, &from, &prop, Qnil)
+	       && COMPOSITION_VALID_P (start, from, prop))
 	run_composition_function (start, from, prop);
     }
 
@@ -521,6 +523,7 @@
          (to - 1).  */
       while (from < to - 1
 	     && find_composition (from, to, &start, &from, &prop, Qnil)
+	     && COMPOSITION_VALID_P (start, from, prop)
 	     && from < to - 1)
 	run_composition_function (start, from, prop);
     }
@@ -528,7 +531,8 @@
   if (check_mask & CHECK_TAIL)
     {
       if (from < to
-	  && find_composition (to - 1, -1, &start, &end, &prop, Qnil))
+	  && find_composition (to - 1, -1, &start, &end, &prop, Qnil)
+	  && COMPOSITION_VALID_P (start, end, prop))
 	{
 	  /* TO should be also at composition boundary.  But,
 	     insertion or deletion will make two compositions adjacent
@@ -542,7 +546,8 @@
 	  run_composition_function (start, end, prop);
 	}
       else if (to < ZV
-	       && find_composition (to, -1, &start, &end, &prop, Qnil))
+	       && find_composition (to, -1, &start, &end, &prop, Qnil)
+	       && COMPOSITION_VALID_P (start, end, prop))
 	run_composition_function (start, end, prop);
     }
 }