(Ffont_face_attributes): Only define if

HAVE_WINDOW_SYSTEM.
(syms_of_font): Only defsubr if HAVE_WINDOW_SYSTEM.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7b14e5eeffa10c59f6ae91654f6a24dedccfd973..9f65fbe91b98a8ddf8ee6528b9d461d0d29ebd9d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-18  Andreas Schwab  <schwab@suse.de>
+
+       * font.c (Ffont_face_attributes): Only define if
+       HAVE_WINDOW_SYSTEM.
+       (syms_of_font): Only defsubr if HAVE_WINDOW_SYSTEM.
+
 2008-06-18  Jason Rumney  <jasonr@gnu.org>
 
         * w32font.c (w32font_list, w32font_match): Add logging.

diff --git a/src/font.c b/src/font.c
index ff97af063a7c11f9faf9086975c61950e8a6b962..ab413f277f234f28cc4455da2eeab9a8907688f5 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -3742,6 +3742,8 @@ FONT is a font-spec, a font-entity, or a font-object.  */)
   return Fcdr (Fassq (key, AREF (font, FONT_EXTRA_INDEX)));
 }
 
+#ifdef HAVE_WINDOW_SYSTEM
+
 DEFUN ("font-face-attributes", Ffont_face_attributes, Sfont_face_attributes, 1, 2, 0,
        doc: /* Return a plist of face attributes generated by FONT.
 FONT is a font name, a font-spec, a font-entity, or a font-object.
@@ -3811,6 +3813,8 @@ are to be displayed on.  If omitted, the selected frame is used.  */)
   return Flist (10, plist);
 }
 
+#endif
+
 DEFUN ("font-put", Ffont_put, Sfont_put, 3, 3, 0,
        doc: /* Set one property of FONT-SPEC: give property PROP value VAL.  */)
      (font_spec, prop, val)
@@ -4852,7 +4856,9 @@ syms_of_font ()
   defsubr (&Sfontp);
   defsubr (&Sfont_spec);
   defsubr (&Sfont_get);
+#ifdef HAVE_WINDOW_SYSTEM
   defsubr (&Sfont_face_attributes);
+#endif
   defsubr (&Sfont_put);
   defsubr (&Slist_fonts);
   defsubr (&Sfont_family_list);