diff options
| author | Kenichi Handa | 2008-01-28 07:06:52 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2008-01-28 07:06:52 +0000 |
| commit | 23c8bcbfcea2ebd5404aa37dc4b892b8a2f6eea3 (patch) | |
| tree | a44af9dffdf5004fdc3fc5d4258d8d882505ef5d | |
| parent | 9e067dbc984eb89a5acbe1d6837f03dfce4ba07d (diff) | |
| download | emacs-23c8bcbfcea2ebd5404aa37dc4b892b8a2f6eea3.tar.gz emacs-23c8bcbfcea2ebd5404aa37dc4b892b8a2f6eea3.zip | |
(FONTP): Make it return 1 also for a font-object.
| -rw-r--r-- | src/font.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/font.h b/src/font.h index 2433cdb0d34..2146c6900bc 100644 --- a/src/font.h +++ b/src/font.h | |||
| @@ -212,14 +212,16 @@ struct font_bitmap | |||
| 212 | 212 | ||
| 213 | /* Predicates to check various font-related objects. */ | 213 | /* Predicates to check various font-related objects. */ |
| 214 | 214 | ||
| 215 | #define FONTP(x) \ | ||
| 216 | (VECTORP (x) && (ASIZE (x) == FONT_SPEC_MAX || ASIZE (x) == FONT_ENTITY_MAX)) | ||
| 217 | #define FONT_SPEC_P(x) \ | 215 | #define FONT_SPEC_P(x) \ |
| 218 | (VECTORP (x) && ASIZE (x) == FONT_SPEC_MAX) | 216 | (VECTORP (x) && ASIZE (x) == FONT_SPEC_MAX) |
| 219 | #define FONT_ENTITY_P(x) \ | 217 | #define FONT_ENTITY_P(x) \ |
| 220 | (VECTORP (x) && ASIZE (x) == FONT_ENTITY_MAX) | 218 | (VECTORP (x) && ASIZE (x) == FONT_ENTITY_MAX) |
| 221 | #define FONT_OBJECT_P(x) \ | 219 | #define FONT_OBJECT_P(x) \ |
| 222 | (XTYPE (x) == Lisp_Misc && XMISCTYPE (x) == Lisp_Misc_Save_Value) | 220 | (XTYPE (x) == Lisp_Misc && XMISCTYPE (x) == Lisp_Misc_Save_Value) |
| 221 | #define FONTP(x) \ | ||
| 222 | ((VECTORP (x) && (ASIZE (x) == FONT_SPEC_MAX \ | ||
| 223 | || ASIZE (x) == FONT_ENTITY_MAX)) \ | ||
| 224 | || FONT_OBJECT_P (x)) | ||
| 223 | 225 | ||
| 224 | #define FONT_ENTITY_NOT_LOADABLE(entity) \ | 226 | #define FONT_ENTITY_NOT_LOADABLE(entity) \ |
| 225 | EQ (AREF (entity, FONT_OBJLIST_INDEX), Qt) | 227 | EQ (AREF (entity, FONT_OBJLIST_INDEX), Qt) |