[Emacs-diffs] /srv/bzr/emacs/trunk r99557: * nsfont.m (nsfont_draw): ns_antialias_text should be a Lisp_Object (Bug#4736).

[Chong Yidong]

------------------------------------------------------------
revno: 99557
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Thu 2010-02-25 19:48:53 -0500
message:
  * nsfont.m (nsfont_draw): ns_antialias_text should be a Lisp_Object 
(Bug#4736).
modified:
  src/ChangeLog
  src/nsfont.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-02-25 02:29:35 +0000
+++ b/src/ChangeLog     2010-02-26 00:48:53 +0000
@@ -1,3 +1,8 @@
+2010-02-26  David Reitter  <address@hidden>
+
+       * nsfont.m (nsfont_draw): ns_antialias_text should be a
+       Lisp_Object (Bug#4736).
+
 2010-02-25  Kenichi Handa  <address@hidden>
 
        * xdisp.c (reseat_to_string): Fix previous change (bug#5609).

=== modified file 'src/nsfont.m'
--- a/src/nsfont.m      2010-02-08 23:39:01 +0000
+++ b/src/nsfont.m      2010-02-26 00:48:53 +0000
@@ -50,7 +50,7 @@
 static Lisp_Object Vns_reg_to_script;
 static Lisp_Object Qapple, Qroman, Qmedium;
 extern Lisp_Object Qappend;
-extern int ns_antialias_text;
+extern Lisp_Object ns_antialias_text;
 extern float ns_antialias_threshold;
 extern int ns_tmp_flags;
 extern struct nsfont_info *ns_tmp_font;
@@ -1231,7 +1231,7 @@
 
     CGContextSetFont (gcontext, font->cgfont);
     CGContextSetFontSize (gcontext, font->size);
-    if (ns_antialias_text == Qnil || font->size <= ns_antialias_threshold)
+    if (NILP (ns_antialias_text) || font->size <= ns_antialias_threshold)
       CGContextSetShouldAntialias (gcontext, 0);
     else
       CGContextSetShouldAntialias (gcontext, 1);