# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1283128397 -32400
# Node ID c1792addf7ea8c0530ad4ca6e5a63a765f5aebc9
# Parent  10e66ac64b616f483685002ae00dd83282167a34# Parent  dd01a03cf5095ca50809f0629fc44d0926f3e432
composite.c (composition_update_it): Fix computing of cmp_it->width.

diff -r 10e66ac64b61 -r c1792addf7ea src/ChangeLog
--- a/src/ChangeLog	Sun Aug 29 18:15:09 2010 -0400
+++ b/src/ChangeLog	Mon Aug 30 09:33:17 2010 +0900
@@ -1,3 +1,8 @@
+2010-08-30  Kenichi Handa  <handa@m17n.org>
+
+	* composite.c (composition_update_it): Fix computing of
+	cmp_it->width.
+
 2010-08-29  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* nsterm.m (ns_draw_window_cursor): Draw BAR_CURSOR correct for R2L.
diff -r 10e66ac64b61 -r c1792addf7ea src/composite.c
--- a/src/composite.c	Sun Aug 29 18:15:09 2010 -0400
+++ b/src/composite.c	Mon Aug 30 09:33:17 2010 +0900
@@ -1440,8 +1440,7 @@
 	{
 	  c = XINT (LGSTRING_CHAR (gstring, i));
 	  cmp_it->nbytes += CHAR_BYTES (c);
-	  cmp_it->width = (LGLYPH_WIDTH (glyph) > 0
-			   ? CHAR_WIDTH (LGLYPH_CHAR (glyph)) : 0);
+	  cmp_it->width += LGLYPH_WIDTH (glyph) > 0 ? CHAR_WIDTH (c) : 0;
 	}
     }
   return c;