# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1138972463 0
# Node ID 55d1392b15da4b8edd31a3b9b11bd776333ca049
# Parent  2bbc3753aa7ef000ae79f800812af283dcb46a5e
*** empty log message ***

diff -r 2bbc3753aa7e -r 55d1392b15da src/ChangeLog
--- a/src/ChangeLog	Fri Feb 03 11:34:53 2006 +0000
+++ b/src/ChangeLog	Fri Feb 03 13:14:23 2006 +0000
@@ -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