From: Kenichi Handa <handa@m17n.org>
Date: Fri, 23 Jun 2006 05:07:12 +0000 (+0000)
Subject: (x_draw_glyph_string) [USE_FONT_BACKEND]: Check
X-Git-Tag: emacs-pretest-23.0.90~8295^2~858
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c8c8ff66e95b9b268c69d646fd4924caeae36141;p=emacs.git

(x_draw_glyph_string) [USE_FONT_BACKEND]: Check
s->face->font on determining underline position.
---

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