From 285e85c6da6ffde6e2c5113501759e8f63d44f37 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 12 Feb 2009 05:55:02 +0000 Subject: [PATCH] (encode_terminal_code): Adjusted for the change of .u.cmp.to. (append_composite_glyph): Likewise. --- src/term.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/term.c b/src/term.c index c425337fe71..3fbc3c46c4d 100644 --- a/src/term.c +++ b/src/term.c @@ -604,7 +604,7 @@ encode_terminal_code (src, src_len, coding) 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 @@ encode_terminal_code (src, src_len, coding) } 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 @@ append_composite_glyph (it) 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; -- 2.39.5