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 --git a/src/ChangeLog b/src/ChangeLog
index a0d7d47ce35f26649601986cce1ee09092582d0c..dc2c8be43e26c20e381b7bbf6528d51f0e2b48bc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/w32term.c b/src/w32term.c
index e9865ed7aee85d52510320b9ac72a802de44390a..7690f13799f3a9f546e3d9bba1c730c76acd7de9 100644 (file)
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -6337,7 +6337,9 @@ the cursor have no effect.  */);
      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",