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.

diff --git a/lisp/faces.el b/lisp/faces.el
index 522446add151e30df97acdb7be328fe82b91480a..21de277cbce708d5bfd5fab920984ebce71cc93f 100644 (file)
--- 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))