# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1287883357 25200
# Node ID dd114432ab017869ef18dfca905981708faf1822
# Parent  e530bc6df030d16d3b628b5005ad803435d9c8c6
Sync X and MS-Windows docs for x-use-underline-position-properties.
* src/w32term.c (syms_of_w32term) <x-use-underline-position-properties>:
Sync doc with the xterm.c version.

diff -r e530bc6df030 -r dd114432ab01 src/ChangeLog
--- a/src/ChangeLog	Sat Oct 23 18:15:43 2010 -0700
+++ b/src/ChangeLog	Sat Oct 23 18:22:37 2010 -0700
@@ -1,5 +1,8 @@
 2010-10-24  Glenn Morris  <rgm@gnu.org>
 
+	* w32term.c (syms_of_w32term) <x-use-underline-position-properties>:
+	Sync doc with the xterm.c version.
+
 	* w32term.c (syms_of_w32term) <x-toolkit-scroll-bars>:
 	* xterm.c (syms_of_xterm) <x-toolkit-scroll-bars>: Sync docs.
 
diff -r e530bc6df030 -r dd114432ab01 src/w32term.c
--- a/src/w32term.c	Sat Oct 23 18:15:43 2010 -0700
+++ b/src/w32term.c	Sat Oct 23 18:22:37 2010 -0700
@@ -6337,7 +6337,9 @@
      doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties.
 A value of nil means ignore them.  If you encounter fonts with bogus
 UNDERLINE_POSITION font properties, for example 7x13 on XFree prior
-to 4.1, set this to nil.  */);
+to 4.1, set this to nil.  You can also use `underline-minimum-offset'
+to override the font's UNDERLINE_POSITION for small font display
+sizes.  */);
   x_use_underline_position_properties = 0;
 
   DEFVAR_BOOL ("x-underline-at-descent-line",