diff options
| author | Gerd Moellmann <gerd@gnu.org> | 2001-04-06 10:14:24 +0000 |
|---|---|---|
| committer | Gerd Moellmann <gerd@gnu.org> | 2001-04-06 10:14:24 +0000 |
| commit | 1f36b2fca24ad0061a9c8c87c6d58e6abb40c447 (patch) | |
| tree | 01fd811c4129b0e74d692a18f8f75c5562af8a4a | |
| parent | 5f34e16f6ea56d65076a9d085f54e78d2968e48a (diff) | |
| download | emacs-1f36b2fca24ad0061a9c8c87c6d58e6abb40c447.tar.gz | |
(COMPOSITION_VALID_P): Allow integers as cdrs of
PROP.
| -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; /* 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 |