*** empty log message ***

diff --git a/src/ChangeLog b/src/ChangeLog
index 0f5506e377384b0121daa7b8cf5bf28b4b48ee7e..f8f37051a035ea69fde721f93a803e23a3d1990b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2004-11-26  Kim F. Storm  <storm@cua.dk>
+
+       * xdisp.c: Undo recent changes for restoring saved_face_id. Instead,
+       set it when it->method is set to next_element_from_display_vector.
+       (setup_for_ellipsis): Add LEN argument.  Callers changed.
+       Set it->saved_face_id.
+       (get_next_display_element): Use loop instead of recursion.
+       Set it->saved_face_id.  Combine duplicate code for ctr chars.
+       (next_element_from_display_vector): Do not set it->saved_face_id.
+       (next_element_from_ellipsis): Use setup_for_ellipsis.
+
 2004-11-26  Eli Zaretskii  <eliz@gnu.org>
 
        * eval.c (Fdefvar): Declare pdl from last change as `volatile' to