Mercurial > emacs

changeset 33507:5f71cb83e287

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(face-set-after-frame-default): If `inhibit-default-face-x-resources' is bound, don't intiialize the default face from X resources.
author Gerd Moellmann <gerd@gnu.org>
date Wed, 15 Nov 2000 19:22:06 +0000
parents ba79891b1cd5
children 027d4bc2e846
files lisp/faces.el
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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.