# HG changeset patch
# User Adrian Robert <Adrian.B.Robert@gmail.com>
# Date 1217209553 0
# Node ID 07311809a1f03731c021a355b78f71cc84704cad
# Parent  c628dd388bdb2f394bb2c1f42877a9d2b0211bea
faces.el:face-set-after-frame-default: treat ns as other window systems

diff -r c628dd388bdb -r 07311809a1f0 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Jul 28 01:41:57 2008 +0000
+++ b/lisp/ChangeLog	Mon Jul 28 01:45:53 2008 +0000
@@ -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 -r c628dd388bdb -r 07311809a1f0 lisp/faces.el
--- a/lisp/faces.el	Mon Jul 28 01:41:57 2008 +0000
+++ b/lisp/faces.el	Mon Jul 28 01:45:53 2008 +0000
@@ -2027,7 +2027,7 @@
 	  ;; 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))