2 files changed, 7 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 643483905d1..7d0f307e4a3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-06  Kenichi Handa  <handa@m17n.org>
+
+        * ftxfont.c (ftxfont_draw_backgrond): Fix args to XFillRectangle.
+
+        * xftfont.c (xftfont_open): Fix setting font->underline_thickness.
+
 2009-04-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * ftfont.c (ftfont_open): Fix checking of the return value of
diff --git a/src/ftxfont.c b/src/ftxfont.c
index dcad85ba7fd..2cf45bb27a0 100644
--- a/src/ftxfont.c
+++ b/src/ftxfont.c
@@ -235,7 +235,7 @@ ftxfont_draw_backgrond (f, font, gc, x, y, width)
                 GCForeground | GCBackground, &xgcv);
   XSetForeground (FRAME_X_DISPLAY (f), gc, xgcv.background);
   XFillRectangle (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), gc,
-                  x, y - font->ascent, width, y + font->descent);
+                  x, y - FONT_BASE (font), width, FONT_HEIGHT (font));
   XSetForeground (FRAME_X_DISPLAY (f), gc, xgcv.foreground);
 }