Mercurial > emacs
changeset 23555:7417378e7cce
(adjust_after_replace): Correctly handle the case that
both byte combining before and byte combining after happen.
(replace_range): Likewise.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Tue, 27 Oct 1998 03:54:13 +0000 |
| parents | e06e84c477fa |
| children | 82fdd7048bcf |
| files | src/insdel.c |
| diffstat | 1 files changed, 17 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/insdel.c Tue Oct 27 03:54:13 1998 +0000 +++ b/src/insdel.c Tue Oct 27 03:54:13 1998 +0000 @@ -1004,8 +1004,7 @@ This function does not adjust markers for byte combining. That should be done in advance by the functions - adjust_markers_for_insert, adjust_markers_for_delete, or - adjust_markers_for_replace. */ + adjust_markers_for_insert or adjust_markers_for_replace. */ static void combine_bytes (pos, pos_byte, nbytes) @@ -1645,8 +1644,14 @@ adjust_point (len - nchars_del, len_byte - nbytes_del); if (combined_after_bytes) - combine_bytes (from + len, from_byte + len_byte, combined_after_bytes); - + { + if (combined_before_bytes == len_byte) + /* This is the case that all new bytes are combined. */ + combined_before_bytes += combined_after_bytes; + else + combine_bytes (from + len, from_byte + len_byte, + combined_after_bytes); + } if (combined_before_bytes) combine_bytes (from, from_byte, combined_before_bytes); } @@ -1896,8 +1901,14 @@ - (PT_BYTE < to_byte ? PT_BYTE : to_byte))); if (combined_after_bytes) - combine_bytes (from + inschars, from_byte + outgoing_insbytes, - combined_after_bytes); + { + if (combined_before_bytes == outgoing_insbytes) + /* This is the case that all new bytes are combined. */ + combined_before_bytes += combined_after_bytes; + else + combine_bytes (from + inschars, from_byte + outgoing_insbytes, + combined_after_bytes); + } if (combined_before_bytes) combine_bytes (from, from_byte, combined_before_bytes);