From: David Reitter <david.reitter@gmail.com>
Date: Mon, 16 Mar 2009 20:46:21 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-23.0.92~162
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4b7a79019936acdd84c5c22bee623c39d79adb17;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ab45886f72..58204bd9b83 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.