# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1151039232 0
# Node ID e33114b32ce59d94926c6da1be4a252fd9516d52
# Parent  f894dd8d64ea232aa3b633949941832e4fcf37f0
(x_draw_glyph_string) [USE_FONT_BACKEND]: Check
s->face->font on determining underline position.

diff -r f894dd8d64ea -r e33114b32ce5 src/xterm.c
--- a/src/xterm.c	Wed Jun 21 01:25:10 2006 +0000
+++ b/src/xterm.c	Fri Jun 23 05:07:12 2006 +0000
@@ -2866,8 +2866,13 @@
 
 #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