faces.el:face-set-after-frame-default: treat ns as other window systems

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9cee8b49b908eaf8f2c98cf49d52014810660084..13e49d392e98b21188ab096df3f4de77567e26fc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-27  Adrian Robert  <Adrian.B.Robert@gmail.com>
+
+       * faces.el (face-set-after-frame-default): Treat 'ns as all other
+       window systems.
+
 2008-07-27  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
        * term/ns-win.el (do-applescript): New alias in carbon-compat section.

diff --git a/lisp/faces.el b/lisp/faces.el
index c42298f77d875e18fada1460035f1511ff7b23e3..76bb02939f55e30f6435decf60e59fb771a9213d 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2027,7 +2027,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))     
+              (memq (window-system frame) '(x w32 ns))          
               (make-face-x-resource-internal face frame))
          ;; Apply attributes specified by face-new-frame-defaults
          (internal-merge-in-global-face face frame))