diff options
| author | Kenichi Handa <handa@m17n.org> | 2007-12-03 14:39:51 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2007-12-03 14:39:51 +0000 |
| commit | 48bb108861c6a5eb302823603e3d70c8139d7b72 (patch) | |
| tree | 03ddc07ae8b88cb6e3a83be400cbc50ddfe433a8 /src/composite.h | |
| parent | c75d4c72634a5e76dd7aeda315281f20c9aeabb1 (diff) | |
| download | emacs-48bb108861c6a5eb302823603e3d70c8139d7b72.tar.gz emacs-48bb108861c6a5eb302823603e3d70c8139d7b72.tar.bz2 emacs-48bb108861c6a5eb302823603e3d70c8139d7b72.zip | |
(COMPOSITION_METHOD): Handle
COMPOSITION_WITH_GLYPH_STRING.
Diffstat (limited to 'src/composite.h')
| -rw-r--r-- | src/composite.h | 10 |
1 files changed, 7 insertions, 3 deletions
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). */ |