From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 21 Feb 2009 13:38:59 +0000 (+0000)
Subject: (syms_of_data): Define Qfont_spec, Qfont_entity, and
X-Git-Tag: emacs-pretest-23.0.91~105
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4e6f26262ed77e778026dea784aae56a1cc3438c;p=emacs.git

(syms_of_data): Define Qfont_spec, Qfont_entity, and
Qfont_object.
(Ftype_of): Recognize font objects.
---

diff --git a/src/data.c b/src/data.c
index bf3fb91fcc3..6221b787608 100644
--- a/src/data.c
+++ b/src/data.c
@@ -30,6 +30,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "frame.h"
 #include "syssignal.h"
 #include "termhooks.h"  /* For FRAME_KBOARD reference in y-or-n-p. */
+#include "font.h"
 
 #ifdef STDC_HEADERS
 #include <float.h>
@@ -85,6 +86,7 @@ Lisp_Object Qprocess;
 static Lisp_Object Qcompiled_function, Qbuffer, Qframe, Qvector;
 static Lisp_Object Qchar_table, Qbool_vector, Qhash_table;
 static Lisp_Object Qsubrp, Qmany, Qunevalled;
+Lisp_Object Qfont_spec, Qfont_entity, Qfont_object;
 
 static Lisp_Object swap_in_symval_forwarding P_ ((Lisp_Object, Lisp_Object));
 
@@ -224,6 +226,12 @@ for example, (type-of 1) returns `integer'.  */)
 	return Qframe;
       if (HASH_TABLE_P (object))
 	return Qhash_table;
+      if (FONT_SPEC_P (object))
+	return Qfont_spec;
+      if (FONT_ENTITY_P (object))
+	return Qfont_entity;
+      if (FONT_OBJECT_P (object))
+	return Qfont_object;
       return Qvector;
 
     case Lisp_Float:
@@ -3140,6 +3148,10 @@ syms_of_data ()
   Qbool_vector = intern ("bool-vector");
   Qhash_table = intern ("hash-table");
 
+  DEFSYM (Qfont_spec, "font-spec");
+  DEFSYM (Qfont_entity, "font-entity");
+  DEFSYM (Qfont_object, "font-object");
+
   staticpro (&Qinteger);
   staticpro (&Qsymbol);
   staticpro (&Qstring);