diff lisp/cus-start.el @ 95792:953225ddde83

* 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.

--- a/lisp/cus-start.el	Tue Jun 10 20:01:54 2008 +0000
+++ b/lisp/cus-start.el	Tue Jun 10 20:22:10 2008 +0000
@@ -331,6 +331,7 @@
 	     (unibyte-display-via-language-environment mule boolean)
 	     (blink-cursor-alist cursor alist "22.1")
 	     (overline-margin display integer "22.1")
+	     (underline-minimum-offset display integer "23.1")
              (mouse-autoselect-window
 	      display (choice
 		       (const :tag "Off (nil)" :value nil)
@@ -348,7 +349,6 @@
 	     ;; xterm.c
 	     (x-use-underline-position-properties display boolean "22.1")
 	     (x-underline-at-descent-line display boolean "22.1")
-	     (x-underline-minimum-display-offset display integer "23.1")
 	     (x-stretch-cursor display boolean "21.1")))
       this symbol group type standard version native-p
       ;; This function turns a value