Mercurial > emacs

changeset 101964:05ec76bd8aa4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(encode_terminal_code): Adjusted for the change of <struct glyph>.u.cmp.to. (append_composite_glyph): Likewise.
author Kenichi Handa <handa@m17n.org>
date Thu, 12 Feb 2009 05:55:02 +0000
parents 8de12e689594
children f6d5eb6db7f4
files src/term.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/term.c	Thu Feb 12 05:54:20 2009 +0000
+++ b/src/term.c	Thu Feb 12 05:55:02 2009 +0000
@@ -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;