From: Kenichi Handa <handa@m17n.org>
Date: Mon, 30 Aug 2010 00:32:29 +0000 (+0900)
Subject: composite.c (composition_update_it): Fix computing of cmp_it->width.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~48^2~219
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=49a752bbf9065bae75aba1f1cea1ae8d6132438a;p=emacs.git

composite.c (composition_update_it): Fix computing of cmp_it->width.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index b58557a944e..4e4f96786d9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/composite.c b/src/composite.c
index 233f9ac8969..96474f43fab 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1440,8 +1440,7 @@ composition_update_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_I
 	{
 	  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;