* 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/dispextern.h b/src/dispextern.h
index 969f1c55021..883fa431724 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2705,6 +2705,7 @@ extern struct frame *last_mouse_frame;
 extern int last_tool_bar_item;
 extern Lisp_Object Vmouse_autoselect_window;
 extern int unibyte_display_via_language_environment;
+extern EMACS_INT underline_minimum_offset;
 
 extern void reseat_at_previous_visible_line_start P_ ((struct it *));