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

[bpt/emacs.git] / src / w32font.c

diff --git a/src/w32font.c b/src/w32font.c
index 7be72bb..77e949a 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))
     {
@@ -1032,7 +1033,9 @@ w32_enumfont_pattern_entity (frame, logical_font, physical_font,
   FONT_SET_STYLE (entity, FONT_WIDTH_INDEX, make_number (100));
 
   if (font_type & RASTER_FONTTYPE)
-    ASET (entity, FONT_SIZE_INDEX, make_number (physical_font->ntmTm.tmHeight));
+    ASET (entity, FONT_SIZE_INDEX,
+          make_number (physical_font->ntmTm.tmHeight
+                       + physical_font->ntmTm.tmExternalLeading));
   else
     ASET (entity, FONT_SIZE_INDEX, make_number (0));