diff options
| author | Gerd Moellmann | 2001-04-06 10:14:24 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-04-06 10:14:24 +0000 |
| commit | 1f36b2fca24ad0061a9c8c87c6d58e6abb40c447 (patch) | |
| tree | 01fd811c4129b0e74d692a18f8f75c5562af8a4a /src | |
| parent | 5f34e16f6ea56d65076a9d085f54e78d2968e48a (diff) | |
| download | emacs-1f36b2fca24ad0061a9c8c87c6d58e6abb40c447.tar.gz emacs-1f36b2fca24ad0061a9c8c87c6d58e6abb40c447.zip | |
(COMPOSITION_VALID_P): Allow integers as cdrs of
PROP.
Diffstat (limited to 'src')
| -rw-r--r-- | src/composite.h | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/composite.h b/src/composite.h index 75a336d6643..d1527f53a4b 100644 --- a/src/composite.h +++ b/src/composite.h | |||
| @@ -90,17 +90,20 @@ extern Lisp_Object composition_temp; | |||
| 90 | 90 | ||
| 91 | /* Return 1 iff the composition is valid. It is valid if length of | 91 | /* Return 1 iff the composition is valid. It is valid if length of |
| 92 | the composition equals to (END - START). */ | 92 | the composition equals to (END - START). */ |
| 93 | #define COMPOSITION_VALID_P(start, end, prop) \ | 93 | #define COMPOSITION_VALID_P(start, end, prop) \ |
| 94 | (CONSP (prop) \ | 94 | (CONSP (prop) \ |
| 95 | && (COMPOSITION_REGISTERD_P (prop) \ | 95 | && (COMPOSITION_REGISTERD_P (prop) \ |
| 96 | ? (COMPOSITION_ID (prop) >= 0 \ | 96 | ? (COMPOSITION_ID (prop) >= 0 \ |
| 97 | && COMPOSITION_ID (prop) <= n_compositions \ | 97 | && COMPOSITION_ID (prop) <= n_compositions \ |
| 98 | && CONSP (XCDR (prop))) \ | 98 | && CONSP (XCDR (prop))) \ |
| 99 | : (composition_temp = XCAR (prop), \ | 99 | : (composition_temp = XCAR (prop), \ |
| 100 | (CONSP (composition_temp) \ | 100 | (CONSP (composition_temp) \ |
| 101 | && (composition_temp = XCDR (composition_temp), \ | 101 | && (composition_temp = XCDR (composition_temp), \ |
| 102 | (NILP (composition_temp) || STRINGP (composition_temp) \ | 102 | (NILP (composition_temp) \ |
| 103 | || VECTORP (composition_temp) || CONSP (composition_temp))))))\ | 103 | || STRINGP (composition_temp) \ |
| 104 | || VECTORP (composition_temp) \ | ||
| 105 | || INTEGERP (composition_temp) \ | ||
| 106 | || CONSP (composition_temp)))))) \ | ||
| 104 | && (end - start) == COMPOSITION_LENGTH (prop)) | 107 | && (end - start) == COMPOSITION_LENGTH (prop)) |
| 105 | 108 | ||
| 106 | /* Return the Nth glyph of composition specified by CMP. CMP is a | 109 | /* Return the Nth glyph of composition specified by CMP. CMP is a |