From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 15 Nov 2000 19:22:06 +0000 (+0000)
Subject: (face-set-after-frame-default): If
X-Git-Tag: emacs-pretest-21.0.90~52
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2392ccb75805b3e2488e48a30028f250829886e0;p=emacs.git

(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 ee65edd3f3b..99b4576decb 100644
--- 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.