# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1157715301 0
# Node ID 116728e737a3330742b2ec2eb802c2f64dec1a4c
# Parent  07fd2daa094fa507a6bbe50347be1d4e0fce2a04
(x_draw_glyph_string): Fix 2006-08-24 change.

diff -r 07fd2daa094f -r 116728e737a3 src/xterm.c
--- a/src/xterm.c	Fri Sep 08 11:34:50 2006 +0000
+++ b/src/xterm.c	Fri Sep 08 11:35:01 2006 +0000
@@ -2689,9 +2689,8 @@
 	  if (!XGetFontProperty (s->font, XA_UNDERLINE_THICKNESS, &h))
 	    h = 1;
 
-          if (x_underline_at_descent_line)
-	    y = s->y + s->height - h;
-          else
+	  y = s->y + s->height - h;
+	  if (!x_underline_at_descent_line)
             {
 	      /* Get the underline position.  This is the recommended
                  vertical offset in pixels from the baseline to the top of