2 files changed, 12 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c10153c047d..dd62f1306ea 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-30  Kenichi Handa  <handa@m17n.org>
+
+        * font.c (Ffont_info): Define only if HAVE_WINDOW_SYSTEM is
+        defined.
+        (syms_of_font): Defsubr Sfont_info only if HAVE_WINDOW_SYSTEM is
+        defined.
+
 2008-05-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * data.c (Fmake_variable_buffer_local, Fmake_local_variable)
diff --git a/src/font.c b/src/font.c
index 84fb5ccd265..484f0257546 100644
--- a/src/font.c
+++ b/src/font.c
@@ -4349,6 +4349,8 @@ Type C-l to recover what previously shown.  */)
 
 #endif  /* FONT_DEBUG */
 
+#ifdef HAVE_WINDOW_SYSTEM
+
 DEFUN ("font-info", Ffont_info, Sfont_info, 1, 2, 0,
        doc: /* Return information about a font named NAME on frame FRAME.
 If FRAME is omitted or nil, use the selected frame.
@@ -4420,6 +4422,7 @@ If the named font is not yet loaded, return nil.  */)
 #endif
   return info;
 }
+#endif
 
 
 #define BUILD_STYLE_TABLE(TBL) \
@@ -4591,7 +4594,9 @@ syms_of_font ()
   defsubr (&Sdraw_string);
 #endif
 #endif  /* FONT_DEBUG */
+#ifdef HAVE_WINDOW_SYSTEM
   defsubr (&Sfont_info);
+#endif
 
   DEFVAR_LISP ("font-encoding-alist", &Vfont_encoding_alist,
                doc: /*