diff options
| author | Gerd Moellmann <gerd@gnu.org> | 2000-11-15 19:22:06 +0000 |
|---|---|---|
| committer | Gerd Moellmann <gerd@gnu.org> | 2000-11-15 19:22:06 +0000 |
| commit | 7f10e88a8fbca1c662a9a823256715b95ff8dc06 (patch) | |
| tree | fd5ffc8eaafcbc7c245780e5213529bdd225943c /lisp/faces.el | |
| parent | b868bf7810c29468f9a606bb52829b2b051ccf0b (diff) | |
| download | emacs-7f10e88a8fbca1c662a9a823256715b95ff8dc06.tar.gz | |
(face-set-after-frame-default): If
`inhibit-default-face-x-resources' is bound, don't intiialize the
default face from X resources.
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 4 |
1 files changed, 3 insertions, 1 deletions
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. |