# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1105963835 0
# Node ID d25630d179ccb234c165e2743fcc6a84c3710c83
# Parent  609c840fe65f26ec4df4d69d6064301e7ea050e9
*** empty log message ***

diff -r 609c840fe65f -r d25630d179cc src/ChangeLog.22
--- a/src/ChangeLog.22	Mon Jan 17 12:10:12 2005 +0000
+++ b/src/ChangeLog.22	Mon Jan 17 12:10:35 2005 +0000
@@ -1,3 +1,18 @@
+2005-01-17  Kenichi Handa  <handa@m17n.org>
+
+	* xfaces.c (merge_faces): Fix argument to lookup_derived_face and
+	lookup_face.
+
+	* xdisp.c (Fformat_mode_line): Fix argument to lookup_named_face.
+
+	* fringe.c (draw_fringe_bitmap_1): Fix argument to
+	lookup_named_face.
+
+2004-12-25  Kenichi Handa  <handa@m17n.org>
+
+	* xdisp.c (get_next_display_element): Sync to the change in HEAD
+	on 2004-12-21.
+
 2004-12-11  Kenichi Handa  <handa@m17n.org>
 
 	* search.c: Sync to the change in HEAD on 2004-11-19, 20.