# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1101479875 0
# Node ID 45bdb8bde2712c0bcb2bd5a3685b5dab0d6ac9d7
# Parent  79f06dc052c5b7153183b0ae5add1e99c588cc59
*** empty log message ***

diff -r 79f06dc052c5 -r 45bdb8bde271 src/ChangeLog
--- a/src/ChangeLog	Fri Nov 26 12:05:49 2004 +0000
+++ b/src/ChangeLog	Fri Nov 26 14:37:55 2004 +0000
@@ -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