Mercurial > emacs
changeset 91355:8e67cd1b2741
(FONTP): Make it return 1 also for a font-object.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Mon, 28 Jan 2008 07:06:52 +0000 |
| parents | 99ac532a6a03 |
| children | 8682800dc1af |
| files | src/font.h |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/font.h Mon Jan 28 07:05:37 2008 +0000 +++ b/src/font.h Mon Jan 28 07:06:52 2008 +0000 @@ -212,14 +212,16 @@ /* Predicates to check various font-related objects. */ -#define FONTP(x) \ - (VECTORP (x) && (ASIZE (x) == FONT_SPEC_MAX || ASIZE (x) == FONT_ENTITY_MAX)) #define FONT_SPEC_P(x) \ (VECTORP (x) && ASIZE (x) == FONT_SPEC_MAX) #define FONT_ENTITY_P(x) \ (VECTORP (x) && ASIZE (x) == FONT_ENTITY_MAX) #define FONT_OBJECT_P(x) \ (XTYPE (x) == Lisp_Misc && XMISCTYPE (x) == Lisp_Misc_Save_Value) +#define FONTP(x) \ + ((VECTORP (x) && (ASIZE (x) == FONT_SPEC_MAX \ + || ASIZE (x) == FONT_ENTITY_MAX)) \ + || FONT_OBJECT_P (x)) #define FONT_ENTITY_NOT_LOADABLE(entity) \ EQ (AREF (entity, FONT_OBJLIST_INDEX), Qt)