# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1081854293 0
# Node ID ca6423ca8d9d26a3967a26b8450e3abafc38032a
# Parent  0167306cb580dab52444bfac9a216c2dcf70c95e
*** empty log message ***

diff -r 0167306cb580 -r ca6423ca8d9d src/ChangeLog.22
--- a/src/ChangeLog.22	Tue Apr 13 11:04:28 2004 +0000
+++ b/src/ChangeLog.22	Tue Apr 13 11:04:53 2004 +0000
@@ -1,5 +1,20 @@
 2004-04-13  Kenichi Handa  <handa@m17n.org>
 
+	* fontset.c (fontset_font): Renamed from fontset_face.  Return
+	value changed.
+	(face_suitable_for_char_p): Adjusted for the change of
+	fontset_font.
+	(face_for_char): Likewise.
+	(make_fontset_for_ascii_face): Fix setting of the fontset element
+	for ASCII.
+	(Finternal_char_font): Use fontset_font instead of FACE_FOR_CHAR
+	to get a font name.
+	(Ffontset_info): Adjusted for the change of fontset_font.
+
+	* composite.c: Sync to HEAD.
+
+	* search.c: Sync to HEAD.
+
 	* coding.c: Sync to HEAD.
 	(emacs_mule_char): Check invalid code more regidly.