Mercurial > emacs
changeset 110059:d24d9e523bc4
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Mon, 30 Aug 2010 06:09:18 +0000 |
| parents | 1b626601d32d (current diff) 6b8c20b6ec43 (diff) |
| children | d575ee440ad4 |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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;