From: Kenichi Handa <handa@m17n.org>
Date: Mon, 3 Dec 2007 14:39:51 +0000 (+0000)
Subject: (COMPOSITION_METHOD): Handle
X-Git-Tag: emacs-pretest-23.0.90~8295^2~194
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=48bb108861c6a5eb302823603e3d70c8139d7b72;p=emacs.git

(COMPOSITION_METHOD): Handle
COMPOSITION_WITH_GLYPH_STRING.
---

diff --git a/src/composite.h b/src/composite.h
index 5a426826bcc..ab77a9f9e1d 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -92,9 +92,13 @@ extern Lisp_Object composition_temp;
    : (composition_temp = XCDR (XCAR (prop)),				\
       (NILP (composition_temp)						\
        ? COMPOSITION_RELATIVE						\
-       : ((INTEGERP (composition_temp) || STRINGP (composition_temp))	\
-	  ? COMPOSITION_WITH_ALTCHARS					\
-	  : COMPOSITION_WITH_RULE_ALTCHARS))))
+       : (INTEGERP (composition_temp) || STRINGP (composition_temp))	\
+       ? COMPOSITION_WITH_ALTCHARS					\
+       : (VECTORP (composition_temp)					\
+	  && ASIZE (composition_temp) >= 2				\
+	  && VECTORP (AREF (composition_temp, 0)))			\
+       ? COMPOSITION_WITH_GLYPH_STRING					\
+       : COMPOSITION_WITH_RULE_ALTCHARS)))
 
 /* Return 1 if the composition is valid.  It is valid if length of
    the composition equals to (END - START).  */