From c8c8ff66e95b9b268c69d646fd4924caeae36141 Mon Sep 17 00:00:00 2001
From: Kenichi Handa <handa@m17n.org>
Date: Fri, 23 Jun 2006 05:07:12 +0000
Subject: [PATCH] (x_draw_glyph_string) [USE_FONT_BACKEND]: Check s->face->font
 on determining underline position.

---
 src/xterm.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/xterm.c b/src/xterm.c
index df99f9cad0d..0c2014b184f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -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
-- 
2.39.5