Commit 7ad27466 authored by Jan Djärv's avatar Jan Djärv
Browse files

* nsfont.m (ns_descriptor_to_entity): Qcondesed and Qexpanded has

been removed, so remove them here also.
parent 93a66b3a
2012-11-09 Jan Djärv <jan.h.d@swipnet.se>
* nsfont.m (ns_descriptor_to_entity): Qcondesed and Qexpanded has
been removed, so remove them here also.
2012-11-09 Stefan Monnier <monnier@iro.umontreal.ca> 2012-11-09 Stefan Monnier <monnier@iro.umontreal.ca>
   
* doc.c (Fdocumentation): Handle new property * doc.c (Fdocumentation): Handle new property
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#define NSFONT_TRACE 0 #define NSFONT_TRACE 0
extern Lisp_Object Qns; extern Lisp_Object Qns;
extern Lisp_Object Qnormal, Qbold, Qitalic, Qcondensed, Qexpanded; extern Lisp_Object Qnormal, Qbold, Qitalic;
static Lisp_Object Qapple, Qroman, Qmedium; static Lisp_Object Qapple, Qroman, Qmedium;
extern Lisp_Object Qappend; extern Lisp_Object Qappend;
extern float ns_antialias_threshold; extern float ns_antialias_threshold;
...@@ -200,9 +200,6 @@ static void ns_glyph_metrics (struct nsfont_info *font_info, ...@@ -200,9 +200,6 @@ static void ns_glyph_metrics (struct nsfont_info *font_info,
/* FONT_SET_STYLE (font_entity, FONT_SLANT_INDEX, /* FONT_SET_STYLE (font_entity, FONT_SLANT_INDEX,
make_number (100 + 100 make_number (100 + 100
* ns_attribute_fvalue (desc, NSFontSlantTrait)));*/ * ns_attribute_fvalue (desc, NSFontSlantTrait)));*/
FONT_SET_STYLE (font_entity, FONT_WIDTH_INDEX,
traits & NSFontCondensedTrait ? Qcondensed :
traits & NSFontExpandedTrait ? Qexpanded : Qnormal);
/* FONT_SET_STYLE (font_entity, FONT_WIDTH_INDEX, /* FONT_SET_STYLE (font_entity, FONT_WIDTH_INDEX,
make_number (100 + 100 make_number (100 + 100
* ns_attribute_fvalue (desc, NSFontWidthTrait)));*/ * ns_attribute_fvalue (desc, NSFontWidthTrait)));*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment