diff options
| author | Kenichi Handa | 2008-09-10 12:02:36 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2008-09-10 12:02:36 +0000 |
| commit | 053ca52becabe78cab8cc30db5f9ca7c301cef04 (patch) | |
| tree | 553cf597ceedfbb21601ed77a55a8e811d1769f6 | |
| parent | 2564beceace9324a832a7a22bc653bdfd1e5fdf4 (diff) | |
| download | emacs-053ca52becabe78cab8cc30db5f9ca7c301cef04.tar.gz emacs-053ca52becabe78cab8cc30db5f9ca7c301cef04.zip | |
(composition_compute_stop_pos): Reset cmp_it->id to -1 at first.
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/composite.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b8333c6bb25..13f878766df 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | compose a grapheme cluster with the preceding base glyph. | 4 | compose a grapheme cluster with the preceding base glyph. |
| 5 | 5 | ||
| 6 | * composite.c (composition_compute_stop_pos): Fix previous change. | 6 | * composite.c (composition_compute_stop_pos): Fix previous change. |
| 7 | Reset cmp_it->id to -1 at first. | ||
| 7 | 8 | ||
| 8 | 2008-09-10 Glenn Morris <rgm@gnu.org> | 9 | 2008-09-10 Glenn Morris <rgm@gnu.org> |
| 9 | 10 | ||
diff --git a/src/composite.c b/src/composite.c index be9871eef39..92e7a1e44cb 100644 --- a/src/composite.c +++ b/src/composite.c | |||
| @@ -1000,6 +1000,7 @@ composition_compute_stop_pos (cmp_it, charpos, bytepos, endpos, string) | |||
| 1000 | if (endpos > charpos + MAX_NEWLINE_DISTANCE) | 1000 | if (endpos > charpos + MAX_NEWLINE_DISTANCE) |
| 1001 | endpos = charpos + MAX_NEWLINE_DISTANCE; | 1001 | endpos = charpos + MAX_NEWLINE_DISTANCE; |
| 1002 | cmp_it->stop_pos = endpos; | 1002 | cmp_it->stop_pos = endpos; |
| 1003 | cmp_it->id = -1; | ||
| 1003 | cmp_it->ch = -2; | 1004 | cmp_it->ch = -2; |
| 1004 | if (find_composition (charpos, endpos, &start, &end, &prop, string) | 1005 | if (find_composition (charpos, endpos, &start, &end, &prop, string) |
| 1005 | && COMPOSITION_VALID_P (start, end, prop)) | 1006 | && COMPOSITION_VALID_P (start, end, prop)) |