# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 974316126 0
# Node ID 5f71cb83e287ed59adf7c192d7e25c982936f773
# Parent  ba79891b1cd5ca3d680a7273434b781a97ea8ad9
(face-set-after-frame-default): If
`inhibit-default-face-x-resources' is bound, don't intiialize the
default face from X resources.

diff -r ba79891b1cd5 -r 5f71cb83e287 lisp/faces.el
--- a/lisp/faces.el	Wed Nov 15 17:54:40 2000 +0000
+++ b/lisp/faces.el	Wed Nov 15 19:22:06 2000 +0000
@@ -1475,7 +1475,9 @@
   (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.