# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1283148558 0
# Node ID d24d9e523bc47dce7d35ca062c5481aab48d48b1
# Parent  1b626601d32d28a028d02e2ec72cbe2d86f14f1d# Parent  6b8c20b6ec43a998b4b67ec8d9adaf51ead63d4e
Merge from mainline.

diff -r 1b626601d32d -r d24d9e523bc4 src/ChangeLog
--- a/src/ChangeLog	Sun Aug 29 22:46:58 2010 +0000
+++ b/src/ChangeLog	Mon Aug 30 06:09:18 2010 +0000
@@ -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 1b626601d32d -r d24d9e523bc4 src/composite.c
--- a/src/composite.c	Sun Aug 29 22:46:58 2010 +0000
+++ b/src/composite.c	Mon Aug 30 06:09:18 2010 +0000
@@ -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 += CHAR_WIDTH (c);
 	}
     }
   return c;