(code_convert_region): Update coding->cmp_data->char_offset

before calling decode_coding.

diff --git a/src/ChangeLog b/src/ChangeLog
index 25795977b965d95c9af31921f7d8a25fd9cfe68a..46d83df8d36e6deb4d8253e79bc5edd9b84e8e14 100644 (file)
--- 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 6083af6eabc9be053be6a50b162ecf318a0ff2f9..7b352d169c4c740b711e5d6d983fe2e3d0d40557 100644 (file)
--- 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----+---+