[Emacs-diffs] emacs/lisp faces.el

[David Reitter]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     David Reitter <davidswelt>      09/03/16 20:46:59

Modified files:
        lisp           : faces.el 

Log message:
        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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/faces.el?cvsroot=emacs&r1=1.438&r2=1.439

Patches:
Index: faces.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/faces.el,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -b -r1.438 -r1.439
--- faces.el    13 Jan 2009 12:40:24 -0000      1.438
+++ faces.el    16 Mar 2009 20:46:59 -0000      1.439
@@ -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))