Mercurial > emacs
changeset 37240:77c7dc464611
(COMPOSITION_VALID_P): Allow integers as cdrs of
PROP.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Fri, 06 Apr 2001 10:14:24 +0000 |
| parents | 4bfdb0896d45 |
| children | e2fffdb05b41 |
| files | src/composite.h |
| diffstat | 1 files changed, 14 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- 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