*** empty log message ***

diff --git a/src/ChangeLog b/src/ChangeLog
index 056bb851f4a87889b9e418572c8ae92cae684552..66061c74810ecf6d4d47d57a53931d7ba2543e0a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2006-02-03  Kim F. Storm  <storm@cua.dk>
+
+       * xdisp.c: Cache last merged escape glyph face.
+       (last_escape_glyph_frame, last_escape_glyph_face_id)
+       (last_escape_glyph_merged_face_id): New variables.
+       (get_next_display_element): Use/update them.
+       (redisplay_internal): Reset them before redisplay.
+
+       * xdisp.c (set_iterator_to_next): Optimize 2004-12-13 fix.
+       Only recheck faces after displaying ellipsis.
+
 2006-02-02  Kenichi Handa  <handa@m17n.org>
 
        * coding.c (decode_composition_emacs_mule): Fix handling of