diff options
| author | Kenichi Handa | 2010-09-27 14:27:28 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2010-09-27 14:27:28 +0900 |
| commit | 4be9765d4bad14d68cdfee2a2c6afe1001d9516a (patch) | |
| tree | cf5d1959dc767eee97d3e1cc096e8e850550e9b6 /src/term.c | |
| parent | 1114abdb3d5a0f4f86d7a28f8c523c6f07790208 (diff) | |
| download | emacs-4be9765d4bad14d68cdfee2a2c6afe1001d9516a.tar.gz emacs-4be9765d4bad14d68cdfee2a2c6afe1001d9516a.zip | |
Remove restriction on the number of glyphs in one composition.
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/term.c b/src/term.c index 2deca1014e8..4c4ae5e048b 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -598,7 +598,7 @@ encode_terminal_code (struct glyph *src, int src_len, struct coding_system *codi | |||
| 598 | if (src->u.cmp.automatic) | 598 | if (src->u.cmp.automatic) |
| 599 | { | 599 | { |
| 600 | gstring = composition_gstring_from_id (src->u.cmp.id); | 600 | gstring = composition_gstring_from_id (src->u.cmp.id); |
| 601 | required = src->u.cmp.to + 1 - src->u.cmp.from; | 601 | required = src->slice.cmp.to + 1 - src->slice.cmp.from; |
| 602 | } | 602 | } |
| 603 | else | 603 | else |
| 604 | { | 604 | { |
| @@ -615,7 +615,7 @@ encode_terminal_code (struct glyph *src, int src_len, struct coding_system *codi | |||
| 615 | } | 615 | } |
| 616 | 616 | ||
| 617 | if (src->u.cmp.automatic) | 617 | if (src->u.cmp.automatic) |
| 618 | for (i = src->u.cmp.from; i <= src->u.cmp.to; i++) | 618 | for (i = src->slice.cmp.from; i <= src->slice.cmp.to; i++) |
| 619 | { | 619 | { |
| 620 | Lisp_Object g = LGSTRING_GLYPH (gstring, i); | 620 | Lisp_Object g = LGSTRING_GLYPH (gstring, i); |
| 621 | int c = LGLYPH_CHAR (g); | 621 | int c = LGLYPH_CHAR (g); |
| @@ -1795,8 +1795,8 @@ append_composite_glyph (struct it *it) | |||
| 1795 | { | 1795 | { |
| 1796 | glyph->u.cmp.automatic = 1; | 1796 | glyph->u.cmp.automatic = 1; |
| 1797 | glyph->u.cmp.id = it->cmp_it.id; | 1797 | glyph->u.cmp.id = it->cmp_it.id; |
| 1798 | glyph->u.cmp.from = it->cmp_it.from; | 1798 | glyph->slice.cmp.from = it->cmp_it.from; |
| 1799 | glyph->u.cmp.to = it->cmp_it.to - 1; | 1799 | glyph->slice.cmp.to = it->cmp_it.to - 1; |
| 1800 | } | 1800 | } |
| 1801 | 1801 | ||
| 1802 | glyph->face_id = it->face_id; | 1802 | glyph->face_id = it->face_id; |