* xdisp.c (underline_minimum_offset): Rename from xterm.c's

x_underline_minimum_display_offset.
(syms_of_xdisp): Declare it here rather than in xterm.c.
* dispextern.h (underline_minimum_offset): Declare it.
* w32term.c (x_draw_glyph_string): Use it.
* xterm.c (x_underline_minimum_display_offset): Move to xdisp.c.
(syms_of_xterm): Don't declare it any more.
(x_draw_glyph_string): Adjust to the new name.

* cus-start.el (underline-minimum-offset) Rename from
x-underline-minimum-display-offset.

1 files changed, 1 insertions, 0 deletions

diff --git a/src/w32term.c b/src/w32term.c
index 63d8a1518fe..7880b8abc10 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2910,6 +2910,7 @@ x_draw_glyph_string (s)
                 else if (s->font)
                   position = (s->font->descent + 1) / 2;
                 }
+              position = max (position, underline_minimum_offset);
             }
           /* Check the sanity of thickness and position.  We should
              avoid drawing underline out of the current line area.  */