[Emacs-diffs] /srv/bzr/emacs/trunk r106677: xftfont.c (xftfont_draw): Use the font metrics of s->font to fill background (Bug#8992).

[Kenichi Handa]

------------------------------------------------------------
revno: 106677 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: trunk
timestamp: Thu 2011-12-15 11:12:56 +0900
message:
  xftfont.c (xftfont_draw): Use the font metrics of s->font to fill background 
(Bug#8992).
modified:
  src/ChangeLog
  src/xftfont.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-12-13 13:58:20 +0000
+++ b/src/ChangeLog     2011-12-15 02:12:08 +0000
@@ -1,3 +1,8 @@
+2011-12-15  YAMAMOTO Mitsuharu  <address@hidden>
+
+       * xftfont.c (xftfont_draw): Use the font metrics of s->font to
+       fill background (Bug#8992).
+
 2011-12-13  Martin Rudalics  <address@hidden>
 
        * window.c (Vwindow_combination_resize)

=== modified file 'src/xftfont.c'
--- a/src/xftfont.c     2011-03-19 05:07:42 +0000
+++ b/src/xftfont.c     2011-12-15 02:12:08 +0000
@@ -654,7 +654,7 @@
 
   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)