From 867eb050827c77b0b8951e4dfca446630e3c04fb Mon Sep 17 00:00:00 2001
From: Chong Yidong <cyd@stupidchicken.com>
Date: Tue, 6 Feb 2007 22:36:16 +0000
Subject: [PATCH] * faces.el (face-set-after-frame-default): Compile attributes
 to be set by frame parameters before merging in X resources.

---
 lisp/ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce97e56f32..d1a7f56b2e 100644
--- 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):
-- 
2.20.1