# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 986552064 0
# Node ID 77c7dc46461135e0fd20337966bba8d99b7e5226
# Parent  4bfdb0896d4506623af6baa4b8e19f49d1b708e3
(COMPOSITION_VALID_P): Allow integers as cdrs of
PROP.

diff -r 4bfdb0896d45 -r 77c7dc464611 src/composite.h
--- a/src/composite.h	Fri Apr 06 10:08:04 2001 +0000
+++ b/src/composite.h	Fri Apr 06 10:14:24 2001 +0000
@@ -90,17 +90,20 @@
 
 /* Return 1 iff the composition is valid.  It is valid if length of
    the composition equals to (END - START).  */
-#define COMPOSITION_VALID_P(start, end, prop)				      \
-  (CONSP (prop)								      \
-   && (COMPOSITION_REGISTERD_P (prop)					      \
-       ? (COMPOSITION_ID (prop) >= 0					      \
-	  && COMPOSITION_ID (prop) <= n_compositions			      \
-	  && CONSP (XCDR (prop)))					      \
-       : (composition_temp = XCAR (prop),				      \
-	  (CONSP (composition_temp)					      \
-	   && (composition_temp = XCDR (composition_temp),		      \
-	       (NILP (composition_temp) || STRINGP (composition_temp)	      \
-		|| VECTORP (composition_temp) || CONSP (composition_temp))))))\
+#define COMPOSITION_VALID_P(start, end, prop)			\
+  (CONSP (prop)							\
+   && (COMPOSITION_REGISTERD_P (prop)				\
+       ? (COMPOSITION_ID (prop) >= 0				\
+	  && COMPOSITION_ID (prop) <= n_compositions		\
+	  && CONSP (XCDR (prop)))				\
+       : (composition_temp = XCAR (prop),			\
+	  (CONSP (composition_temp)				\
+	   && (composition_temp = XCDR (composition_temp),	\
+	       (NILP (composition_temp)				\
+		|| STRINGP (composition_temp)			\
+		|| VECTORP (composition_temp)			\
+		|| INTEGERP (composition_temp)			\
+		|| CONSP (composition_temp))))))		\
    && (end - start) == COMPOSITION_LENGTH (prop))
 
 /* Return the Nth glyph of composition specified by CMP.  CMP is a