# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1088569273 0
# Node ID c254de7b810cce5abe341288e6e88627c70e4db6
# Parent  e94e49dc760e3b810a4a6533469508bc903403c6
*** empty log message ***

diff -r e94e49dc760e -r c254de7b810c src/ChangeLog.22
--- a/src/ChangeLog.22	Wed Jun 30 04:20:06 2004 +0000
+++ b/src/ChangeLog.22	Wed Jun 30 04:21:13 2004 +0000
@@ -1,3 +1,9 @@
+2004-06-30  Kenichi Handa  <handa@m17n.org>
+
+	* xfaces.c (Fface_font): If frame is not on a window system,
+	ignore CHARACTER arg.  If HAVE_WINDOW_SYSTEM is not defined, don't
+	refer to face->font.
+
 2004-05-29  Kenichi Handa  <handa@m17n.org>
 
 	* xdisp.c (BUILD_GLYPH_STRINGS): Check if s is NULL.