emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r101208: composite.c (composition_upd


From: Kenichi Handa
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r101208: composite.c (composition_update_it): Fix computing of cmp_it->width.
Date: Mon, 30 Aug 2010 09:33:17 +0900
User-agent: Bazaar (2.0.3)

------------------------------------------------------------
revno: 101208 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: trunk
timestamp: Mon 2010-08-30 09:33:17 +0900
message:
  composite.c (composition_update_it): Fix computing of cmp_it->width.
modified:
  src/ChangeLog
  src/composite.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-08-29 10:30:45 +0000
+++ b/src/ChangeLog     2010-08-30 00:32:29 +0000
@@ -1,3 +1,8 @@
+2010-08-30  Kenichi Handa  <address@hidden>
+
+       * composite.c (composition_update_it): Fix computing of
+       cmp_it->width.
+
 2010-08-29  Jan Djärv  <address@hidden>
 
        * nsterm.m (ns_draw_window_cursor): Draw BAR_CURSOR correct for R2L.

=== modified file 'src/composite.c'
--- a/src/composite.c   2010-08-25 04:39:30 +0000
+++ b/src/composite.c   2010-08-30 00:32:29 +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 += LGLYPH_WIDTH (glyph) > 0 ? CHAR_WIDTH (c) : 0;
        }
     }
   return c;


reply via email to

[Prev in Thread] Current Thread [Next in Thread]