*** empty log message ***

diff --git a/src/ChangeLog b/src/ChangeLog
index 2635af04ee5d0682394f7fb0df5004e53d6f0a33..21208459b477042d08eed35a2e188abde9407503 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2005-01-10  Kim F. Storm  <storm@cua.dk>
+
+       * dispextern.h (merge_faces): Rename from merge_into_realized_face.
+
+       * xfaces.c (merge_faces): Rename from merge_into_realized_face.
+       Callers changed.
+       Add support to merge with lisp face id too (if face_name is t).
+
+       * xdisp.c (get_next_display_element, next_element_from_display_vector):
+       Don't lookup lface_id from display table glyphs here; instead use
+       merge_faces to merge the lisp face id into current face.
+
 2005-01-09  Kim F. Storm  <storm@cua.dk>
 
        * dispextern.h (struct it): New member dpvec_face_id.