# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1173565731 0
# Node ID 6da62180836cf27cb1e7a87cd0f6f2dbe81aa2c3
# Parent  622e7c78002b78f72f5452748b578a783fb491bc
(face-set-after-frame-default): Recalculate face customizations after
applying X resources.

diff -r 622e7c78002b -r 6da62180836c lisp/faces.el
--- a/lisp/faces.el	Sat Mar 10 22:28:41 2007 +0000
+++ b/lisp/faces.el	Sat Mar 10 22:28:51 2007 +0000
@@ -1791,7 +1791,11 @@
 	    (face-spec-set face (face-user-default-spec face) frame)
 	    (internal-merge-in-global-face face frame)
 	    (if (memq window-system '(x w32 mac))
-		(make-face-x-resource-internal face frame)))
+		(make-face-x-resource-internal face frame))
+	    ;; If the user has customized the face, don't let X
+	    ;; resources override the customizations.
+	    (if (get face 'theme-face)
+		(custom-theme-recalc-face face)))
 	(error nil)))
     ;; Apply the attributes specified by frame parameters.  This
     ;; rewrites parameters changed by make-face-x-resource-internal