2 files changed, 13 insertions, 0 deletions

diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index d2cc10d3a57..3d0b65fe854 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -1,6 +1,13 @@
 This file describes various problems that have been encountered
 in compiling, installing and running GNU Emacs.
 
+* Underlines appear at the wrong position.
+
+This is caused by fonts having a wrong UNDERLINE_POSITION property.
+An example is the font 7x13 on XFree prior to version 4.1.  To
+circumvent this problem, set x-use-underline-position-properties to
+nil in your .emacs.
+
 * Building Emacs with GCC 2.9x fails in the `src' directory.
 
 This may happen if you use a development version of GNU `cpp' from one
diff --git a/src/ChangeLog b/src/ChangeLog
index 5e6dc08d45b..6555aca1264 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-03  Gerd Moellmann  <gerd@gnu.org>
+
+        * xterm.c (x_use_underline_position_properties): New variable.
+        (x_draw_glyph_string): Use it.
+        (syms_of_xterm): DEFVAR_BOOL it.
+
 2001-04-02  Gerd Moellmann  <gerd@gnu.org>
 
         * xterm.c (x_alloc_nearest_color_1): New function.