# HG changeset patch
# User David Reitter <david.reitter@gmail.com>
# Date 1237236381 0
# Node ID d5adbc1cd346c9e66d79058df10ace141d8c8cd9
# Parent  ce2094e81bc031e67c5dfaa67d821c5da56540a9
*** empty log message ***

diff -r ce2094e81bc0 -r d5adbc1cd346 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Mar 16 14:10:47 2009 +0000
+++ b/lisp/ChangeLog	Mon Mar 16 20:46:21 2009 +0000
@@ -1,3 +1,9 @@
+2009-03-16  David Reitter <david.reitter@gmail.com>
+
+	* faces.el (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.
+
 2009-03-16  Richard M Stallman  <rms@gnu.org>
 
 	* mail/rmail.el (rmail-retry-failure): Discard rmail-ignored-headers.