aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Rumney2008-07-23 15:37:44 +0000
committerJason Rumney2008-07-23 15:37:44 +0000
commit4b1355037a72c74a0711193d8ef9555bdb728772 (patch)
tree9e239785132b47fa3bcd7f30d2bacbcc776969a8 /src
parentf0492e5ff5fe3f380bbbf8e902120fa9b52a35fe (diff)
downloademacs-4b1355037a72c74a0711193d8ef9555bdb728772.tar.gz
emacs-4b1355037a72c74a0711193d8ef9555bdb728772.zip
* w32font.c (w32font_open): Set font type to gdi.
* w32uniscribe.c (uniscribe_open): Set font type to uniscribe.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/w32font.c1
-rw-r--r--src/w32uniscribe.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 019c5f05a23..6640bca3ab3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,9 @@
2 2
3 * w32font.c (w32_enumfont_pattern_entity): Return height consistent 3 * w32font.c (w32_enumfont_pattern_entity): Return height consistent
4 with opened font. 4 with opened font.
5 (w32font_open): Set font type to gdi.
6
7 * w32uniscribe.c (uniscribe_open): Set font type to uniscribe.
5 8
62008-07-23 Dan Nicolaescu <dann@ics.uci.edu> 92008-07-23 Dan Nicolaescu <dann@ics.uci.edu>
7 10
diff --git a/src/w32font.c b/src/w32font.c
index 45d5742f4aa..77e949a6af0 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -238,6 +238,7 @@ w32font_open (f, font_entity, pixel_size)
238 238
239 font_object = font_make_object (VECSIZE (struct w32font_info), 239 font_object = font_make_object (VECSIZE (struct w32font_info),
240 font_entity, pixel_size); 240 font_entity, pixel_size);
241 ASET (font_object, FONT_TYPE_INDEX, Qgdi);
241 242
242 if (!w32font_open_internal (f, font_entity, pixel_size, font_object)) 243 if (!w32font_open_internal (f, font_entity, pixel_size, font_object))
243 { 244 {
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index 8fb7eb60376..0e0a4e8d143 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -125,6 +125,8 @@ uniscribe_open (f, font_entity, pixel_size)
125 struct uniscribe_font_info *uniscribe_font 125 struct uniscribe_font_info *uniscribe_font
126 = (struct uniscribe_font_info *) XFONT_OBJECT (font_object); 126 = (struct uniscribe_font_info *) XFONT_OBJECT (font_object);
127 127
128 ASET (font_object, FONT_TYPE_INDEX, Quniscribe);
129
128 if (!w32font_open_internal (f, font_entity, pixel_size, font_object)) 130 if (!w32font_open_internal (f, font_entity, pixel_size, font_object))
129 { 131 {
130 return Qnil; 132 return Qnil;