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

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

diff --git a/src/w32term.c b/src/w32term.c
index 857887397fe..75714a4a118 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2009,7 +2009,7 @@ x_draw_composite_glyph_string_foreground (s)
 
 	      if (! VECTORP (adjustment))
 		{
-		  width += XINT (LGLYPH_WIDTH (g));
+		  width += LGLYPH_WIDTH (g);
 		  continue;
 		}
 	      if (from < i)
@@ -2022,7 +2022,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;
 	    }