From: Jason Rumney Date: Sat, 2 Jun 2007 22:11:44 +0000 (+0000) Subject: (x_font_min_bounds): Use FONT_AVG_WIDTH. X-Git-Tag: emacs-pretest-23.0.90~8295^2~454 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=11e260be5b5451823dd0da023ae9922828631033;p=emacs.git (x_font_min_bounds): Use FONT_AVG_WIDTH. (w32_cache_char_metrics): Use FONT_WIDTH. --- diff --git a/src/w32term.c b/src/w32term.c index 2d3969001d8..f3fed6b8e63 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -1062,9 +1062,9 @@ w32_cache_char_metrics (font) { /* 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 @@ x_font_min_bounds (font, w, h) * average and maximum width, and maximum height. */ *h = FONT_HEIGHT (font); - *w = FONT_WIDTH (font); + *w = FONT_AVG_WIDTH (font); }