From 23c8bcbfcea2ebd5404aa37dc4b892b8a2f6eea3 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Mon, 28 Jan 2008 07:06:52 +0000 Subject: [PATCH] (FONTP): Make it return 1 also for a font-object. --- src/font.h | 6 ++++-- 1 file 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 /* 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) -- 2.39.5