# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1210936349 0
# Node ID 0ec0130d17e7638fcd1da7ae0e26507901cae331
# Parent  dee9cd027812022cc39a5ca9c71ca52b07168ac3
*** empty log message ***

diff -r dee9cd027812 -r 0ec0130d17e7 src/ChangeLog
--- a/src/ChangeLog	Fri May 16 11:11:31 2008 +0000
+++ b/src/ChangeLog	Fri May 16 11:12:29 2008 +0000
@@ -1,3 +1,10 @@
+2008-05-16  Eli Zaretskii  <eliz@gnu.org>
+
+	* xfaces.c (merge_face_ref, merge_face_vectors)
+	(Finternal_set_lisp_face_attribute): Use FONT_*_INDEX only when
+	HAVE_WINDOW_SYSTEM is defined.
+	(Fface_font): Fix non-HAVE_WINDOW_SYSTEM case.
+
 2008-05-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* keyboard.c (parse_menu_item): Do not cache key shortcut any more.