1 files changed, 15 insertions, 0 deletions

diff --git a/src/ChangeLog.22 b/src/ChangeLog.22
index 1b6b2fa7c6b..7c6829e8f46 100644
--- a/src/ChangeLog.22
+++ b/src/ChangeLog.22
@@ -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.