2 files changed, 8 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index be233c512f5..019c5f05a23 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-23  Jason Rumney  <jasonr@gnu.org>
+
+        * w32font.c (w32_enumfont_pattern_entity): Return height consistent
+        with opened font.
+
 2008-07-23  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * s/usg5-4.h (ADDR_CORRECT): Remove, unused.
diff --git a/src/w32font.c b/src/w32font.c
index 7be72bb49a8..45d5742f4aa 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -1032,7 +1032,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));