Commit 64e0ae2a authored by Kenichi Handa's avatar Kenichi Handa
Browse files

(Finsert_file_contents): Read a file contents into the

correct buffer (byte) position.  Adjusted for the change of
code_convert_region.
parent 0ab9dd76
......@@ -3728,7 +3728,7 @@ This does code conversion according to the value of\n\
/* Allow quitting out of the actual I/O. */
immediate_quit = 1;
QUIT;
this = read (fd, BYTE_POS_ADDR (PT + inserted - 1) + 1, trytry);
this = read (fd, BYTE_POS_ADDR (PT_BYTE + inserted - 1) + 1, trytry);
immediate_quit = 0;
if (this <= 0)
......@@ -3771,7 +3771,12 @@ This does code conversion according to the value of\n\
if (inserted > 0)
{
if (CODING_MAY_REQUIRE_DECODING (&coding))
inserted = code_convert_region (PT, PT + inserted, &coding, 0, 0);
{
code_convert_region (PT, PT_BYTE, PT + inserted, PT_BYTE + inserted,
&coding, 0, 0);
inserted = (NILP (current_buffer->enable_multibyte_characters)
? coding.produced : coding.produced_char);
}
#ifdef DOS_NT
/* Use the conversion type to determine buffer-file-type
......
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