From: Miles Bader <miles@gnu.org>
Date: Mon, 28 Aug 2006 04:33:45 +0000 (+0000)
Subject: Merge from emacs--devo--0
X-Git-Tag: emacs-pretest-23.0.90~8295^2~754
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d65dc2c390f866441935840580266c29e536fab1;p=emacs.git

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 399-413)

   - Update from CVS
   - Rcirc update from Ryan Yeske
   - Merge from gnus--rel--5.10
   - Miscellaneous tq-related fixes.

 * gnus--rel--5.10  (patch 126-127)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-105
---

d65dc2c390f866441935840580266c29e536fab1
diff --cc src/xterm.c
index 9cd945ae63b,c2cf2721881..bb87b377d22
--- a/src/xterm.c
+++ b/src/xterm.c
@@@ -2858,32 -2689,24 +2864,35 @@@ x_draw_glyph_string (s
  	  if (!XGetFontProperty (s->font, XA_UNDERLINE_THICKNESS, &h))
  	    h = 1;
  
- 	  /* Get the underline position.  This is the recommended
- 	     vertical offset in pixels from the baseline to the top of
- 	     the underline.  This is a signed value according to the
- 	     specs, and its default is
- 
- 	     ROUND ((maximum descent) / 2), with
- 	     ROUND(x) = floor (x + 0.5)  */
- 
 +#ifdef USE_FONT_BACKEND
 +	  if (enable_font_backend)
 +	    {
 +	      if (s->face->font)
 +		/* In the future, we must use information of font.  */
 +		y = s->ybase + (s->face->font->max_bounds.descent + 1) / 2;
 +	      else
 +		y = s->y + s->height - h;
 +	    }
 +	  else
 +#endif
- 	  if (x_use_underline_position_properties
- 	      && XGetFontProperty (s->font, XA_UNDERLINE_POSITION, &tem))
- 	    y = s->ybase + (long) tem;
- 	  else if (s->face->font)
- 	    y = s->ybase + (s->face->font->max_bounds.descent + 1) / 2;
- 	  else
+           if (x_underline_at_descent_line)
  	    y = s->y + s->height - h;
+           else
+             {
+ 	      /* Get the underline position.  This is the recommended
+                  vertical offset in pixels from the baseline to the top of
+                  the underline.  This is a signed value according to the
+                  specs, and its default is
+ 
+ 	         ROUND ((maximum descent) / 2), with
+ 	         ROUND(x) = floor (x + 0.5)  */
+ 
+               if (x_use_underline_position_properties
+                   && XGetFontProperty (s->font, XA_UNDERLINE_POSITION, &tem))
+                 y = s->ybase + (long) tem;
+               else if (s->face->font)
+                 y = s->ybase + (s->face->font->max_bounds.descent + 1) / 2;
+             }
  
  	  if (s->face->underline_defaulted_p)
  	    XFillRectangle (s->display, s->window, s->gc,