(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 a7785ca2a96ba96b095c0d605bacd78010d8a0e0..7f439334b914797cd5bc0a8c97d17bfb38056422 100644 (file)
--- 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 16598c2d58175d22e66ac194bf8514f70a846a9e..a8c92ab9a75bda8eed9e8555ca53f4746f9efe25 100644 (file)
--- 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