# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1180822304 0
# Node ID 8bc489730b6f88399e02382054b22aaf17b13109
# Parent  bca4afff760cc08bebdda2b76856dd29ef2a9bf3
(x_font_min_bounds): Use FONT_AVG_WIDTH.
(w32_cache_char_metrics): Use FONT_WIDTH.

diff -r bca4afff760c -r 8bc489730b6f src/w32term.c
--- a/src/w32term.c	Sat Jun 02 22:07:16 2007 +0000
+++ b/src/w32term.c	Sat Jun 02 22:11:44 2007 +0000
@@ -1062,9 +1062,9 @@
         {
           /* Use the font width and height as max bounds, as not all BDF
              fonts contain the letter 'x'. */
-          font->max_bounds.width = FONT_MAX_WIDTH (font);
+          font->max_bounds.width = FONT_WIDTH (font);
           font->max_bounds.lbearing = -font->bdf->llx;
-          font->max_bounds.rbearing = FONT_MAX_WIDTH (font) - font->bdf->urx;
+          font->max_bounds.rbearing = FONT_WIDTH (font) - font->bdf->urx;
           font->max_bounds.ascent = FONT_BASE (font);
           font->max_bounds.descent = FONT_DESCENT (font);
         }
@@ -6544,7 +6544,7 @@
    * average and maximum width, and maximum height.
    */
   *h = FONT_HEIGHT (font);
-  *w = FONT_WIDTH (font);
+  *w = FONT_AVG_WIDTH (font);
 }