# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1174849086 0
# Node ID e3710dba6329c49849809ddbb6e7e28ea874a59e
# Parent  99960fddd88cfdaa991c0b8275ceb31f1917144c
(face-set-after-frame-default): Revert 2007-03-10 change.  Merge in X
resources before global face.

diff -r 99960fddd88c -r e3710dba6329 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Mar 25 17:54:49 2007 +0000
+++ b/lisp/ChangeLog	Sun Mar 25 18:58:06 2007 +0000
@@ -1,5 +1,8 @@
 2007-03-25  Chong Yidong  <cyd@stupidchicken.com>
 
+	* faces.el (face-set-after-frame-default): Revert 2007-03-10
+	change.  Merge in X resources before global face.
+
 	* progmodes/compile.el (compilation-start): Save
 	compilation-directory rather than default-directory as local var.
 	(compilation-directory): Mark as safe local var.
diff -r 99960fddd88c -r e3710dba6329 lisp/faces.el
--- a/lisp/faces.el	Sun Mar 25 17:54:49 2007 +0000
+++ b/lisp/faces.el	Sun Mar 25 18:58:06 2007 +0000
@@ -1789,13 +1789,9 @@
       (condition-case ()
 	  (progn
 	    (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))
-	    ;; 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)))
+	    (internal-merge-in-global-face face frame))
 	(error nil)))
     ;; Apply the attributes specified by frame parameters.  This
     ;; rewrites parameters changed by make-face-x-resource-internal