aboutsummaryrefslogtreecommitdiffstats
path: root/src/w32term.c
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2013-01-04 11:05:33 +0900
committerYAMAMOTO Mitsuharu2013-01-04 11:05:33 +0900
commit4240dd3cef858e4431bb349925c755d793c560b3 (patch)
tree0fc955b3162b59e3d80a439763cc4f10a1386f27 /src/w32term.c
parentf032a318307096c87c4c19928e623e30175d9b1a (diff)
downloademacs-4240dd3cef858e4431bb349925c755d793c560b3.tar.gz
emacs-4240dd3cef858e4431bb349925c755d793c560b3.zip
Don't use previous underline thickness or position if previous underline type is underwave.
Diffstat (limited to 'src/w32term.c')
-rw-r--r--src/w32term.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/w32term.c b/src/w32term.c
index 84afd8c300b..8b9414b9cfb 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2464,7 +2464,8 @@ x_draw_glyph_string (struct glyph_string *s)
2464 unsigned long thickness, position; 2464 unsigned long thickness, position;
2465 int y; 2465 int y;
2466 2466
2467 if (s->prev && s->prev->face->underline_p) 2467 if (s->prev && s->prev->face->underline_p
2468 && s->prev->face->underline_type == FACE_UNDER_LINE)
2468 { 2469 {
2469 /* We use the same underline style as the previous one. */ 2470 /* We use the same underline style as the previous one. */
2470 thickness = s->prev->underline_thickness; 2471 thickness = s->prev->underline_thickness;