1 files changed, 7 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cd9c1383511..84e8e010937 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-01  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xfaces.c (get_lface_attributes): Function deleted.
+        (merge_named_face, lookup_named_face, lookup_derived_face)
+        (realize_named_face): Call lface_from_face_name directly, and use
+        the fact that merge_face_vectors does not alter its FROM argument.
+
 2008-02-02  Jason Rumney  <jasonr@gnu.org>
 
         * w32term.c (w32_read_socket) <WM_CHAR>: Decode non-Unicode