* w32font.c (w32font_open): Set font type to gdi.

* w32uniscribe.c (uniscribe_open): Set font type to uniscribe.

diff --git a/src/ChangeLog b/src/ChangeLog
index 019c5f05a23234f0a62f6c9f0a0344d8a19c216f..6640bca3ab34ff7795bc6b2d4ae1d4a1f0cb5443 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,9 @@
 
         * w32font.c (w32_enumfont_pattern_entity): Return height consistent
         with opened font.
+        (w32font_open): Set font type to gdi.
+
+        * w32uniscribe.c (uniscribe_open): Set font type to uniscribe.
 
 2008-07-23  Dan Nicolaescu  <dann@ics.uci.edu>
 

diff --git a/src/w32font.c b/src/w32font.c
index 45d5742f4aa24a16d77e3d07c714e134a9f3d898..77e949a6af095142fae5a6d6e4daadd9ece0d91c 100644 (file)
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -238,6 +238,7 @@ w32font_open (f, font_entity, pixel_size)
 
   font_object = font_make_object (VECSIZE (struct w32font_info),
                                  font_entity, pixel_size);
+  ASET (font_object, FONT_TYPE_INDEX, Qgdi);
 
   if (!w32font_open_internal (f, font_entity, pixel_size, font_object))
     {

diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index 8fb7eb603764c3a1e181abf34bdbaace84782688..0e0a4e8d1436b2f61a52cb9947636bbac9d6ec9a 100644 (file)
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -125,6 +125,8 @@ uniscribe_open (f, font_entity, pixel_size)
   struct uniscribe_font_info *uniscribe_font
     = (struct uniscribe_font_info *) XFONT_OBJECT (font_object);
 
+  ASET (font_object, FONT_TYPE_INDEX, Quniscribe);
+
   if (!w32font_open_internal (f, font_entity, pixel_size, font_object))
     {
       return Qnil;