From: Kenichi Handa <handa@m17n.org>
Date: Fri, 26 Feb 2010 01:22:23 +0000 (+0900)
Subject: from trunk
X-Git-Tag: emacs-pretest-23.1.93~7
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=06aac9016fc074f856a4b374572024a68784e630;p=emacs.git

from trunk
---

06aac9016fc074f856a4b374572024a68784e630
diff --cc src/ChangeLog
index 8ad6941a806,60c63a8ea97..36e056b786d
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
 +2010-02-26  Kenichi Handa  <handa@m17n.org>
 +
 +	* xdisp.c (reseat_to_string): Fix previous change.
 +
+ 2010-02-26  David Reitter  <david.reitter@gmail.com>
+ 
+ 	* nsfont.m (nsfont_draw): ns_antialias_text should be a
+ 	Lisp_Object (Bug#4736).
+ 
  2010-02-25  Kenichi Handa  <handa@m17n.org>
  
  	* xdisp.c (reseat_to_string): Fix previous change (bug#5609).