* 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, 1 deletions

diff --git a/src/macterm.c b/src/macterm.c
index 2871bfa1179..b20857317d9 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -4083,7 +4083,7 @@ x_draw_glyph_string (s)
               if (s->face->font)
                 y = s->ybase + (s->face->font->max_bounds.descent + 1) / 2;
             }
-
+          /* FIXME: Obey underline_minimum_offset.  */
           if (s->face->underline_defaulted_p)
             mac_fill_rectangle (s->f, s->gc, s->x, y,
                                 s->background_width, h);