martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* nsfont.m (nsfont_draw): ns_antialias_text should be a Lisp_Object (Bug#4736).

Browse Source
This commit is contained in:
Chong Yidong
2010-02-25 19:48:53 -05:00
parent 8a249abc87
commit cf2fdcfbd3
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@@ -1,3 +1,8 @@
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).

4
src/nsfont.m
View File

@@ -50,7 +50,7 @@ extern Lisp_Object Qnormal, Qbold, Qitalic, Qcondensed, Qexpanded;
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 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y,
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);