From: Kenichi Handa <handa@m17n.org>
Date: Fri, 23 May 2008 04:43:48 +0000 (+0000)
Subject: (x_draw_glyph_string): Be sure to update
X-Git-Tag: emacs-pretest-23.0.90~5343
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=71b7654711f5ef923eaf5c43233c3fca518eec96;p=emacs.git

(x_draw_glyph_string): Be sure to update
s->underline_thickness and s->underline_position.
---

diff --git a/src/w32term.c b/src/w32term.c
index 348df816aab..eb45d30b54b 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2908,9 +2908,9 @@ x_draw_glyph_string (s)
                 else if (s->font)
                   position = (s->font->descent + 1) / 2;
                 }
-              s->underline_thickness = thickness;
-              s->underline_position =position;
             }
+	  s->underline_thickness = thickness;
+	  s->underline_position =position;
           y = s->ybase + position;
           if (s->face->underline_defaulted_p)
             {
diff --git a/src/xterm.c b/src/xterm.c
index d1aef140419..b4c49d4085f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2742,9 +2742,9 @@ x_draw_glyph_string (s)
 		  else if (s->font)
 		    position = (s->font->descent + 1) / 2;
 		}
-	      s->underline_thickness = thickness;
-	      s->underline_position = position;
 	    }
+	  s->underline_thickness = thickness;
+	  s->underline_position = position;
 	  y = s->ybase + position;
 	  if (s->face->underline_defaulted_p)
 	    XFillRectangle (s->display, s->window, s->gc,