# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1201504012 0
# Node ID 8e67cd1b27417a1fcee56ac0a80b6a0771103821
# Parent  99ac532a6a03bb8df2cdf1525ef6b4d0b3337314
(FONTP): Make it return 1 also for a font-object.

diff -r 99ac532a6a03 -r 8e67cd1b2741 src/font.h
--- 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)