Commit 4e6f2626 authored by Chong Yidong's avatar Chong Yidong
Browse files

(syms_of_data): Define Qfont_spec, Qfont_entity, and

Qfont_object.
(Ftype_of): Recognize font objects.
parent 0b6f228c
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment