diff options
| author | David Reitter <david.reitter@gmail.com> | 2009-03-16 20:46:59 +0000 |
|---|---|---|
| committer | David Reitter <david.reitter@gmail.com> | 2009-03-16 20:46:59 +0000 |
| commit | e51fe00a187fb450681cb5da61c461b6327f0863 (patch) | |
| tree | 84d46333c38602b37a3181295f1cc7dd7bdfebf5 /lisp/faces.el | |
| parent | 4b7a79019936acdd84c5c22bee623c39d79adb17 (diff) | |
| download | emacs-e51fe00a187fb450681cb5da61c461b6327f0863.tar.gz | |
set-face-attributes-from-resources, face-set-after-frame-default:
Do not import X resources on NS because NS does not have system-wide X resources.
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 522446add15..21de277cbce 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -338,7 +338,7 @@ specifies an invalid attribute." (defun set-face-attributes-from-resources (face frame) "Set attributes of FACE from X resources for FRAME." - (when (memq (framep frame) '(x w32 ns)) + (when (memq (framep frame) '(x w32)) (dolist (definition face-x-resources) (let ((attribute (car definition))) (dolist (entry (cdr definition)) @@ -2020,7 +2020,7 @@ frame parameters in PARAMETERS and `default-frame-alist'." ;; X resouces for the default face are applied during ;; x-create-frame. (and (not (eq face 'default)) - (memq (window-system frame) '(x w32 ns)) + (memq (window-system frame) '(x w32)) (make-face-x-resource-internal face frame)) ;; Apply attributes specified by face-new-frame-defaults (internal-merge-in-global-face face frame)) |