(face-set-after-frame-default): If

`inhibit-default-face-x-resources' is bound, don't intiialize the
default face from X resources.

diff --git a/lisp/faces.el b/lisp/faces.el
index ee65edd3f3bdd0f868b000a4c68371d96212328a..99b4576decbc7ae53a27be4bf0ba4e6b37243cbd 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1475,7 +1475,9 @@ Initialize colors of certain faces from frame parameters."
   (dolist (face (face-list))
     (face-spec-set face (face-user-default-spec face) frame)
     (internal-merge-in-global-face face frame)
-    (when (memq window-system '(x w32 mac))
+    (when (and (memq window-system '(x w32 mac))
+              (or (not (boundp 'inhibit-default-face-x-resources))
+                  (not (eq face 'default))))
       (make-face-x-resource-internal face frame)))
 
   ;; Initialize attributes from frame parameters.