From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 25 Mar 2007 18:58:06 +0000 (+0000)
Subject: (face-set-after-frame-default): Revert 2007-03-10 change.  Merge in X
X-Git-Tag: emacs-pretest-22.0.97~182
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6aa2269da5e4cde468efa3ba000ecd71712102e5;p=emacs.git

(face-set-after-frame-default): Revert 2007-03-10 change.  Merge in X
resources before global face.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a7785ca2a96..7f439334b91 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/faces.el b/lisp/faces.el
index 16598c2d581..a8c92ab9a75 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1789,13 +1789,9 @@ Initialize colors of certain faces from frame parameters."
       (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