(x_draw_glyph_string) [USE_FONT_BACKEND]: Check
authorKenichi Handa <handa@m17n.org>
Fri, 23 Jun 2006 05:07:12 +0000 (05:07 +0000)
committerKenichi Handa <handa@m17n.org>
Fri, 23 Jun 2006 05:07:12 +0000 (05:07 +0000)
s->face->font on determining underline position.

src/xterm.c

index df99f9c..0c2014b 100644 (file)
@@ -2866,8 +2866,13 @@ x_draw_glyph_string (s)
 
 #ifdef USE_FONT_BACKEND
          if (enable_font_backend)
-           /* In the future, we must use information of font.  */
-           y = s->ybase + (s->face->font->max_bounds.descent + 1) / 2;
+           {
+             if (s->face->font)
+               /* In the future, we must use information of font.  */
+               y = s->ybase + (s->face->font->max_bounds.descent + 1) / 2;
+             else
+               y = s->y + s->height - h;
+           }
          else
 #endif
          if (x_use_underline_position_properties