# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1216827464 0
# Node ID 7f7286fdbf06aa4a8b071767b1db45f8f0c828c4
# Parent  779ab2611e60518c71306a54f9c7e6a778d3f56f
* w32font.c (w32font_open): Set font type to gdi.

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

diff -r 779ab2611e60 -r 7f7286fdbf06 src/ChangeLog
--- a/src/ChangeLog	Wed Jul 23 14:00:05 2008 +0000
+++ b/src/ChangeLog	Wed Jul 23 15:37:44 2008 +0000
@@ -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 -r 779ab2611e60 -r 7f7286fdbf06 src/w32font.c
--- a/src/w32font.c	Wed Jul 23 14:00:05 2008 +0000
+++ b/src/w32font.c	Wed Jul 23 15:37:44 2008 +0000
@@ -238,6 +238,7 @@
 
   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 -r 779ab2611e60 -r 7f7286fdbf06 src/w32uniscribe.c
--- a/src/w32uniscribe.c	Wed Jul 23 14:00:05 2008 +0000
+++ b/src/w32uniscribe.c	Wed Jul 23 15:37:44 2008 +0000
@@ -125,6 +125,8 @@
   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;