(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 348df816aab2fb5d19ea708568de1a3cd3eb9dc4..eb45d30b54bee42238a144b63a09e45cdc12cd0b 100644 (file)
--- 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 d1aef1404195b2d941ed61edd41ab0e4d1476231..b4c49d4085f514147a754560babd91118a612cd3 100644 (file)
--- 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,