From: Kenichi Handa <handa@m17n.org>
Date: Thu, 15 Dec 2011 02:12:08 +0000 (+0900)
Subject: xftfont.c (xftfont_draw): Use the font metrics of s->font to fill background (Bug... 
X-Git-Tag: emacs-pretest-24.0.93~168
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=100d5755ed82e6c47833a3559fb0a154381d5afd;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 68547e191f2..dacce28a87d 100644
--- 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 c27a4fcf91a..8cb4c494854 100644
--- 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)