(w32font_open_internal): Don't include external leading in font height.

diff --git a/src/ChangeLog b/src/ChangeLog
index 939d3e274bbffb828b1d71581a883ba2bbb8dfa9..82bb25ae26cc472078fd5cd8bc47a593eb6a37c2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-26  Jason Rumney  <jasonr@gnu.org>
+
+       * w32font.c (w32font_open_internal): Don't include external
+       leading in font height.
+
 2008-11-26  Glenn Morris  <rgm@gnu.org>
 
        * xfaces.c (Fx_font_family_list): Replace lisp/term/pc-win.el

diff --git a/src/w32font.c b/src/w32font.c
index 63cd5c2de47130ef1e6da739589fe16e32c0004a..40d4bd640498b3f62f79633faeb47879e9584556 100644 (file)
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -843,8 +843,12 @@ w32font_open_internal (f, font_entity, pixel_size, font_object)
   }
 
   font->max_width = w32_font->metrics.tmMaxCharWidth;
+  /* Parts of Emacs display assume that height = ascent + descent... 
+     so height is defined later, after ascent and descent.
   font->height = w32_font->metrics.tmHeight
     + w32_font->metrics.tmExternalLeading;
+  */
+
   font->space_width = font->average_width = w32_font->metrics.tmAveCharWidth;
 
   font->vertical_centering = 0;
@@ -876,6 +880,7 @@ w32font_open_internal (f, font_entity, pixel_size, font_object)
   font->min_width = font->space_width;
   font->ascent = w32_font->metrics.tmAscent;
   font->descent = w32_font->metrics.tmDescent;
+  font->height = font->ascent + font->descent;
 
   if (metrics)
     {