[Emacs-diffs] emacs/src term.c

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   09/02/12 05:55:02

Modified files:
        src            : term.c 

Log message:
        (encode_terminal_code): Adjusted for the change of
        <struct glyph>.u.cmp.to.
        (append_composite_glyph): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/term.c?cvsroot=emacs&r1=1.236&r2=1.237

Patches:
Index: term.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/term.c,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -b -r1.236 -r1.237
--- term.c      4 Feb 2009 01:35:16 -0000       1.236
+++ term.c      12 Feb 2009 05:55:02 -0000      1.237
@@ -604,7 +604,7 @@
          if (src->u.cmp.automatic)
            {
              gstring = composition_gstring_from_id (src->u.cmp.id);
-             required = src->u.cmp.to - src->u.cmp.from;
+             required = src->u.cmp.to + 1 - src->u.cmp.from;
            }
          else
            {
@@ -621,7 +621,7 @@
            }
 
          if (src->u.cmp.automatic)
-           for (i = src->u.cmp.from; i < src->u.cmp.to; i++)
+           for (i = src->u.cmp.from; i <= src->u.cmp.to; i++)
              {
                Lisp_Object g = LGSTRING_GLYPH (gstring, i);
                int c = LGLYPH_CHAR (g);
@@ -1788,7 +1788,7 @@
          glyph->u.cmp.automatic = 1;
          glyph->u.cmp.id = it->cmp_it.id;
          glyph->u.cmp.from = it->cmp_it.from;
-         glyph->u.cmp.to = it->cmp_it.to;
+         glyph->u.cmp.to = it->cmp_it.to - 1;
        }
 
       glyph->face_id = it->face_id;