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

been removed, so remove them here also.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9bd6ccec01705bc880380c3faf3267c6e861f2fb..6cf10f0fa308a9725941728e1334a051bbee6dac 100644 (file)
--- 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 d2e5108bb7f709aa788f6303b91f1ab96aa07091..88dbcfdc450cf02a917f8143fe9a0cf9892f0e4f 100644 (file)
--- 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)));*/