From 2392ccb75805b3e2488e48a30028f250829886e0 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Wed, 15 Nov 2000 19:22:06 +0000 Subject: [PATCH] (face-set-after-frame-default): If `inhibit-default-face-x-resources' is bound, don't intiialize the default face from X resources. --- lisp/faces.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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. -- 2.39.5