diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2012-11-09 07:36:51 +0100 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2012-11-09 07:36:51 +0100 |
| commit | 7ad27466f1bd9a61389b8b8b83db21ff2acfc575 (patch) | |
| tree | 44789a04bd0a957772e6928c7ec42363c4a441f8 | |
| parent | 93a66b3a3d1b1d19da6d3e759ebe4b9192c70efc (diff) | |
| download | emacs-7ad27466f1bd9a61389b8b8b83db21ff2acfc575.tar.gz | |
* nsfont.m (ns_descriptor_to_entity): Qcondesed and Qexpanded has
been removed, so remove them here also.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/nsfont.m | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9bd6ccec017..6cf10f0fa30 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +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> * doc.c (Fdocumentation): Handle new property diff --git a/src/nsfont.m b/src/nsfont.m index d2e5108bb7f..88dbcfdc450 100644 --- a/src/nsfont.m +++ b/src/nsfont.m @@ -46,7 +46,7 @@ Author: Adrian Robert (arobert@cogsci.ucsd.edu) #define NSFONT_TRACE 0 extern Lisp_Object Qns; -extern Lisp_Object Qnormal, Qbold, Qitalic, Qcondensed, Qexpanded; +extern Lisp_Object Qnormal, Qbold, Qitalic; static Lisp_Object Qapple, Qroman, Qmedium; extern Lisp_Object Qappend; extern float ns_antialias_threshold; @@ -200,9 +200,6 @@ ns_descriptor_to_entity (NSFontDescriptor *desc, /* FONT_SET_STYLE (font_entity, FONT_SLANT_INDEX, make_number (100 + 100 * 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, make_number (100 + 100 * ns_attribute_fvalue (desc, NSFontWidthTrait)));*/ |