[Emacs-diffs] /srv/bzr/emacs/trunk r102069: Sync X and MS-Windows docs for x-use-underline-position-properties.

[Glenn Morris]

------------------------------------------------------------
revno: 102069
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2010-10-23 18:22:37 -0700
message:
  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.
modified:
  src/ChangeLog
  src/w32term.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-10-24 01:15:43 +0000
+++ b/src/ChangeLog     2010-10-24 01:22:37 +0000
@@ -1,5 +1,8 @@
 2010-10-24  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2010-10-24 01:15:43 +0000
+++ b/src/w32term.c     2010-10-24 01:22:37 +0000
@@ -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",