[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110856: * nsfont.m (Qcondensed, Qexp
From: |
Jan D. |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110856: * nsfont.m (Qcondensed, Qexpanded): New variables. |
Date: |
Fri, 09 Nov 2012 16:44:07 +0100 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110856
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Fri 2012-11-09 16:44:07 +0100
message:
* nsfont.m (Qcondensed, Qexpanded): New variables.
(ns_descriptor_to_entity): Restore Qcondensed, Qexpanded setting.
(syms_of_nsfont): Defsym Qcondensed, Qexpanded.
modified:
src/ChangeLog
src/nsfont.m
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-11-09 14:45:15 +0000
+++ b/src/ChangeLog 2012-11-09 15:44:07 +0000
@@ -1,3 +1,9 @@
+2012-11-09 Jan Djärv <address@hidden>
+
+ * nsfont.m (Qcondensed, Qexpanded): New variables.
+ (ns_descriptor_to_entity): Restore Qcondensed, Qexpanded setting.
+ (syms_of_nsfont): Defsym Qcondensed, Qexpanded.
+
2012-11-09 Dmitry Antipov <address@hidden>
Fix recently introduced crash on MS-Windows (Bug#12839).
=== modified file 'src/nsfont.m'
--- a/src/nsfont.m 2012-11-09 06:36:51 +0000
+++ b/src/nsfont.m 2012-11-09 15:44:07 +0000
@@ -48,6 +48,7 @@
extern Lisp_Object Qns;
extern Lisp_Object Qnormal, Qbold, Qitalic;
static Lisp_Object Qapple, Qroman, Qmedium;
+static Lisp_Object Qcondensed, Qexpanded;
extern Lisp_Object Qappend;
extern float ns_antialias_threshold;
extern int ns_tmp_flags;
@@ -200,6 +201,9 @@
/* 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)));*/
@@ -1508,6 +1512,8 @@
{
nsfont_driver.type = Qns;
register_font_driver (&nsfont_driver, NULL);
+ DEFSYM (Qcondensed, "condensed");
+ DEFSYM (Qexpanded, "expanded");
DEFSYM (Qapple, "apple");
DEFSYM (Qroman, "roman");
DEFSYM (Qmedium, "medium");
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110856: * nsfont.m (Qcondensed, Qexpanded): New variables.,
Jan D. <=