[Emacs-diffs] emacs/src ChangeLog w32font.c

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   08/11/26 13:37:19

Modified files:
        src            : ChangeLog w32font.c 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7125&r2=1.7126
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32font.c?cvsroot=emacs&r1=1.56&r2=1.57

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7125
retrieving revision 1.7126
diff -u -b -r1.7125 -r1.7126
--- ChangeLog   26 Nov 2008 05:32:22 -0000      1.7125
+++ ChangeLog   26 Nov 2008 13:37:17 -0000      1.7126
@@ -1,3 +1,8 @@
+2008-11-26  Jason Rumney  <address@hidden>
+
+       * w32font.c (w32font_open_internal): Don't include external
+       leading in font height.
+
 2008-11-26  Glenn Morris  <address@hidden>
 
        * xfaces.c (Fx_font_family_list): Replace lisp/term/pc-win.el

Index: w32font.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32font.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- w32font.c   24 Nov 2008 13:15:00 -0000      1.56
+++ w32font.c   26 Nov 2008 13:37:19 -0000      1.57
@@ -843,8 +843,12 @@
   }
 
   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 @@
   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)
     {