diff options
| author | Richard M. Stallman <rms@gnu.org> | 2001-12-17 15:33:32 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 2001-12-17 15:33:32 +0000 |
| commit | 0e79d66738310dc543d639d7d92dfdfb0660f384 (patch) | |
| tree | 91396e88dadea6d7ebca3c8cd72305c7af059959 | |
| parent | 93dec0196becfb2d190dcd3c5eca1715388c6b9f (diff) | |
| download | emacs-0e79d66738310dc543d639d7d92dfdfb0660f384.tar.gz | |
(code_convert_region): Update coding->cmp_data->char_offset
before calling decode_coding.
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/coding.c | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 25795977b96..46d83df8d36 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -5,7 +5,12 @@ 2001-12-17 Richard M. Stallman <rms@gnu.org> - * coding.c (DECODE_COMPOSITION_END): Check for ! COMPOSING (coding) + * coding.c (code_convert_region): Update coding->cmp_data->char_offset + before calling decode_coding. + + * charset.c (Fdefine_charset): Call Fupdate_coding_systems_internal. + + * coding.c (DECODE_COMPOSITION_END): Check for ! COMPOSING_P (coding) instead of only for COMPOSITION_DISABLED. 2001-12-16 Richard M. Stallman <rms@gnu.org> diff --git a/src/coding.c b/src/coding.c index 6083af6eabc..7b352d169c4 100644 --- a/src/coding.c +++ b/src/coding.c @@ -5516,7 +5516,11 @@ code_convert_region (from, from_byte, to, to_byte, coding, encodep, replace) if (encodep) result = encode_coding (coding, src, dst, len_byte, 0); else - result = decode_coding (coding, src, dst, len_byte, 0); + { + if (coding->composing != COMPOSITION_DISABLED) + coding->cmp_data->char_offset = from + inserted; + result = decode_coding (coding, src, dst, len_byte, 0); + } /* The buffer memory is now: +--------+-------converted-text----+--+------original-text----+---+ |