Commit 0e79d667 authored by Richard M. Stallman's avatar Richard M. Stallman

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

before calling decode_coding.
parent 93dec019
......@@ -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>
......
......@@ -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----+---+
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment