# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1088568729 0
# Node ID 62d04caf8fb9e872f6fffd854f7b7cdd02de96a8
# Parent  8282359ed2128817c906032ef02d97ebc96b64c7
(Fface_font): If HAVE_WINDOW_SYSTEM is not defined,
don't refer to face->font.

diff -r 8282359ed212 -r 62d04caf8fb9 src/xfaces.c
--- a/src/xfaces.c	Tue Jun 29 16:48:18 2004 +0000
+++ b/src/xfaces.c	Wed Jun 30 04:12:09 2004 +0000
@@ -4997,14 +4997,18 @@
 
       if (! face)
 	return Qnil;
-      if (NILP (character))
-	return build_string (face->font_name);
-      CHECK_CHARACTER (character);
-      face_id = FACE_FOR_CHAR (f, face, XINT (character), -1, Qnil);
-      face = FACE_FROM_ID (f, face_id);
-      return (face->font && face->font_name
-	      ? build_string (face->font_name)
-	      : Qnil);
+#ifdef HAVE_WINDOW_SYSTEM
+      if (!NILP (character))
+	{
+	  CHECK_CHARACTER (character);
+	  face_id = FACE_FOR_CHAR (f, face, XINT (character), -1, Qnil);
+	  face = FACE_FROM_ID (f, face_id);
+	  return (face->font && face->font_name
+		  ? build_string (face->font_name)
+		  : Qnil);
+	}
+#endif
+      return build_string (face->font_name);
     }
 }