[Emacs-diffs] /srv/bzr/emacs/trunk r110853: * nsfont.m (ns_descriptor_to_entity): Qcondesed and Qexpanded has

[Jan D.]

------------------------------------------------------------
revno: 110853
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Fri 2012-11-09 07:36:51 +0100
message:
  * nsfont.m (ns_descriptor_to_entity): Qcondesed and Qexpanded has
  been removed, so remove them here also.
modified:
  src/ChangeLog
  src/nsfont.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-11-09 04:10:16 +0000
+++ b/src/ChangeLog     2012-11-09 06:36:51 +0000
@@ -1,3 +1,8 @@
+2012-11-09  Jan Djärv  <address@hidden>
+
+       * nsfont.m (ns_descriptor_to_entity): Qcondesed and Qexpanded has
+       been removed, so remove them here also.
+
 2012-11-09  Stefan Monnier  <address@hidden>
 
        * doc.c (Fdocumentation): Handle new property

=== modified file 'src/nsfont.m'
--- a/src/nsfont.m      2012-11-08 19:51:07 +0000
+++ b/src/nsfont.m      2012-11-09 06:36:51 +0000
@@ -46,7 +46,7 @@
 #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 @@
 /*    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)));*/