From 49a752bbf9065bae75aba1f1cea1ae8d6132438a Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Mon, 30 Aug 2010 09:32:29 +0900 Subject: [PATCH] composite.c (composition_update_it): Fix computing of cmp_it->width. --- src/ChangeLog | 5 +++++ src/composite.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) 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 + + * composite.c (composition_update_it): Fix computing of + cmp_it->width. + 2010-08-29 Jan Djärv * 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; -- 2.39.2