mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 10:31:37 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
before calling decode_coding.
This commit is contained in:
Richard M. Stallman 2001-12-17 15:33:32 +00:00
parent 93dec0196b
commit 0e79d66738
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ChangeLog
View file

@ -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>

4
src/coding.c
View file

@ -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
{
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----+---+