# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1196690046 0
# Node ID 32461c53ccb4701c171dcfd6a1406db83c6f7254
# Parent  609500aa30a8e6f2683c54dec110a5cd1bf88790
*** empty log message ***

diff -r 609500aa30a8 -r 32461c53ccb4 src/ChangeLog.unicode
--- a/src/ChangeLog.unicode	Mon Dec 03 13:53:55 2007 +0000
+++ b/src/ChangeLog.unicode	Mon Dec 03 13:54:06 2007 +0000
@@ -1,5 +1,24 @@
 2007-12-03  Kenichi Handa  <handa@ni.aist.go.jp>
 
+	* xfaces.c [HAVE_WINDOW_SYSTEM]: Include "font.h" unconditionally.
+	(choose_face_font): Accept new form of font-spec.
+
+	* frame.h (font_driver_list): Declare it unconditionally.
+	(struct frame): Define members font_driver_list and font_data_list
+	unconditionally.
+
+	* fontset.c: Include "font.h" unconditionally.
+	(generate_ascii_font_name): Use font_parse_xlfd and
+	font_unparse_xlfd.
+	(Fset_fontset_font): Accept a font-spec object.
+
+	* font.c (font_unparse_xlfd): If pixel_size is zero, make the
+	PIXEL_SIZE part a wild card.
+
+	* dispextern.h (struct glyph_string): Define members clip and
+	num_clips unconditionally.
+	(struct face): Define members font_info and extra unconditionally.
+
 	* ftfont.c (ftfont_open): Set members maybe_otf and otf of
 	ftfont_info only when HAVE_LIBOTF is defined.