* 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.

diff --git a/src/ChangeLog b/src/ChangeLog
index cd9c1383511846e265df4a97e5c019adbb2969a1..84e8e010937211e9d1c0a63eff5f04a49d54717d 100644 (file)
--- 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