Don't use previous underline thickness or position if previous underline type is underwave.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 32b19b5cffb..fb407c87611 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2825,7 +2825,8 @@ x_draw_glyph_string (struct glyph_string *s)
               unsigned long thickness, position;
               int y;
 
-              if (s->prev && s->prev->face->underline_p)
+              if (s->prev && s->prev->face->underline_p
+                  && s->prev->face->underline_type == FACE_UNDER_LINE)
                 {
                   /* We use the same underline style as the previous one.  */
                   thickness = s->prev->underline_thickness;