* faces.el (face-set-after-frame-default): Compile attributes to

be set by frame parameters before merging in X resources.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce97e56f32db6437a3081b0297dde48ad90e69a8..d1a7f56b2e1596afe9f7e9a1dee9fc9da3a2e1e1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-06  Chong Yidong  <cyd@stupidchicken.com>
+
+       * faces.el (face-set-after-frame-default): Compile attributes to
+       be set by frame parameters before merging in X resources.
+
 2007-02-06  Juanma Barranquero  <lekktu@gmail.com>
 
        * simple.el (blink-matching-paren-dont-ignore-comments):