[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100647: Fix wrong font metrics for mouse highlight (backport 106677 from trunk)

[Chong Yidong]

------------------------------------------------------------
revno: 100647
author: YAMAMOTO Mitsuharu  <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sun 2012-01-15 10:55:52 +0800
message:
  Fix wrong font metrics for mouse highlight (backport 106677 from trunk)
  
  * src/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     2012-01-13 19:15:24 +0000
+++ b/src/ChangeLog     2012-01-15 02:55:52 +0000
@@ -1,3 +1,8 @@
+2012-01-15  YAMAMOTO Mitsuharu  <address@hidden>
+
+       * xftfont.c (xftfont_draw): Use the font metrics of s->font to
+       fill background (Bug#8992).
+
 2012-01-13  Kenichi Handa  <address@hidden>
 
        * character.c (char_width): New function.

=== modified file 'src/xftfont.c'
--- a/src/xftfont.c     2012-01-11 07:52:35 +0000
+++ b/src/xftfont.c     2012-01-15 02:55:52 +0000
@@ -689,7 +689,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)