Mercurial > emacs

diff src/term.c @ 110598:ee58b36ab139

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove restriction on the number of glyphs in one composition.
author Kenichi Handa <handa@m17n.org>
date Mon, 27 Sep 2010 14:27:28 +0900
parents 41bf9b6f3b91
children 0e84d4500f6b
line wrap: on
line diff
--- a/src/term.c	Wed Sep 22 11:56:28 2010 +0900
+++ b/src/term.c	Mon Sep 27 14:27:28 2010 +0900
@@ -598,7 +598,7 @@
 	  if (src->u.cmp.automatic)
 	    {
 	      gstring = composition_gstring_from_id (src->u.cmp.id);
-	      required = src->u.cmp.to + 1 - src->u.cmp.from;
+	      required = src->slice.cmp.to + 1 - src->slice.cmp.from;
 	    }
 	  else
 	    {
@@ -615,7 +615,7 @@
 	    }
 
 	  if (src->u.cmp.automatic)
-	    for (i = src->u.cmp.from; i <= src->u.cmp.to; i++)
+	    for (i = src->slice.cmp.from; i <= src->slice.cmp.to; i++)
 	      {
 		Lisp_Object g = LGSTRING_GLYPH (gstring, i);
 		int c = LGLYPH_CHAR (g);
@@ -1795,8 +1795,8 @@
 	{
 	  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 - 1;
+	  glyph->slice.cmp.from = it->cmp_it.from;
+	  glyph->slice.cmp.to = it->cmp_it.to - 1;
 	}
 
       glyph->face_id = it->face_id;