From: Kim F. Storm <storm@cua.dk>
Date: Fri, 8 Sep 2006 11:35:01 +0000 (+0000)
Subject: (x_draw_glyph_string): Fix 2006-08-24 change.
X-Git-Tag: emacs-pretest-22.0.90~703
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1118718c056bb093492957df7fa4486f67131fc8;p=emacs.git

(x_draw_glyph_string): Fix 2006-08-24 change.
---

diff --git a/src/xterm.c b/src/xterm.c
index c2cf2721881..6a392f96559 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2689,9 +2689,8 @@ x_draw_glyph_string (s)
 	  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