Commit 4240dd3c authored by YAMAMOTO Mitsuharu's avatar YAMAMOTO Mitsuharu

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

parent f032a318
......@@ -5,6 +5,11 @@
* xterm.c (x_draw_underwave): Make underwave look more triangular
and also degrade gracefully for small fonts. (Bug#13000)
* nsterm.m (ns_draw_text_decoration):
* w32term.c (x_draw_glyph_string):
* xterm.c (x_draw_glyph_string): Don't use previous underline
thickness and position if previous underline type is underwave.
2012-12-31 Glenn Morris <rgm@gnu.org>
* keymap.c (Fkey_description): Doc fix. (Bug#13323)
......
......@@ -2634,6 +2634,7 @@ Note that CURSOR_WIDTH is meaningful only for (h)bar cursors.
/* If the prev was underlined, match its appearance. */
if (s->prev && s->prev->face->underline_p
&& s->prev->face->underline_type == FACE_UNDER_LINE
&& s->prev->underline_thickness > 0)
{
thickness = s->prev->underline_thickness;
......
......@@ -2464,7 +2464,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;
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment