xftfont.c (xftfont_draw): Use the font metrics of s->font to fill background (Bug...

diff --git a/src/ChangeLog b/src/ChangeLog
index 68547e191f2b6354f497f1c1406a5333f54de894..dacce28a87df9a5c781aea398555c9a6cb8fa81b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * xftfont.c (xftfont_draw): Use the font metrics of s->font to
+       fill background (Bug#8992).
+
 2011-12-13  Martin Rudalics  <rudalics@gmx.at>
 
        * window.c (Vwindow_combination_resize)

diff --git a/src/xftfont.c b/src/xftfont.c
index c27a4fcf91ad0df0b8e8ec9e076564135cfb7fc9..8cb4c49485471785dafa77b2cf22d85d46dc149f 100644 (file)
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -654,7 +654,7 @@ xftfont_draw (struct glyph_string *s, int from, int to, int x, int y, int with_b
 
   if (with_background)
     XftDrawRect (xft_draw, &bg,
-                x, y - face->font->ascent, s->width, face->font->height);
+                x, y - s->font->ascent, s->width, s->font->height);
   code = alloca (sizeof (FT_UInt) * len);
   for (i = 0; i < len; i++)
     code[i] = ((XCHAR2B_BYTE1 (s->char2b + from + i) << 8)