Mercurial > emacs
changeset 102609:56f3fbbbd88c
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.
| author | David Reitter <david.reitter@gmail.com> |
|---|---|
| date | Mon, 16 Mar 2009 20:46:59 +0000 |
| parents | d5adbc1cd346 |
| children | 2a51c267d9ca |
| files | lisp/faces.el |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/faces.el Mon Mar 16 20:46:21 2009 +0000 +++ b/lisp/faces.el Mon Mar 16 20:46:59 2009 +0000 @@ -338,7 +338,7 @@ (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 @@ ;; 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))