From: Kenichi Handa <handa@m17n.org>
Date: Sat, 1 Dec 2007 02:42:24 +0000 (+0000)
Subject: (x_draw_composite_glyph_string_foreground): Adjusted for
X-Git-Tag: emacs-pretest-23.0.90~8295^2~221
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=11bfed587c9bba1c0e839a99f1e1a6d3b8936cf1;p=emacs.git

(x_draw_composite_glyph_string_foreground): Adjusted for
the change of lispy gstring.
---

diff --git a/src/xterm.c b/src/xterm.c
index 7d20e9bd48f..55185fb57f2 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1542,7 +1542,7 @@ x_draw_composite_glyph_string_foreground (s)
 
 	      if (! VECTORP (adjustment))
 		{
-		  width += XINT (LGLYPH_WIDTH (g));
+		  width += LGLYPH_WIDTH (g);
 		  continue;
 		}
 	      if (from < i)
@@ -1555,7 +1555,7 @@ x_draw_composite_glyph_string_foreground (s)
 	      wadjust = XINT (AREF (adjustment, 2));
 
 	      font->driver->draw (s, i, i + 1, x + xoff, y + yoff, 0);
-	      x += XINT (LGLYPH_WIDTH (g)) + wadjust;
+	      x += wadjust;
 	      from = i + 1;
 	      width = 0;
 	    }