mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-19 10:22:27 +00:00
(encode_eol): Fix typo that prevented converting to Mac
line endings. Always update dst_bytes to number of bytes actually copied. (decode_eol): Fix value of coding->produced when decoding Unix line endings (in case this function is ever used for that).
This commit is contained in:
parent
f313ee82af
commit
993824c9b3
12
src/coding.c
12
src/coding.c
@ -2595,7 +2595,7 @@ decode_eol (coding, source, destination, src_bytes, dst_bytes)
|
||||
else
|
||||
safe_bcopy (source, destination, src_bytes);
|
||||
src += src_bytes;
|
||||
dst += dst_bytes;
|
||||
dst += src_bytes;
|
||||
coding->fake_multibyte = 1;
|
||||
break;
|
||||
}
|
||||
@ -2662,18 +2662,16 @@ encode_eol (coding, source, destination, src_bytes, dst_bytes)
|
||||
if (dst_bytes)
|
||||
bcopy (source, destination, src_bytes);
|
||||
else
|
||||
{
|
||||
safe_bcopy (source, destination, src_bytes);
|
||||
dst_bytes = src_bytes;
|
||||
}
|
||||
if (coding->eol_type == CODING_EOL_CRLF)
|
||||
safe_bcopy (source, destination, src_bytes);
|
||||
dst_bytes = src_bytes;
|
||||
if (coding->eol_type == CODING_EOL_CR)
|
||||
{
|
||||
while (src_bytes--)
|
||||
{
|
||||
if ((c = *dst++) == '\n')
|
||||
dst[-1] = '\r';
|
||||
else if (BASE_LEADING_CODE_P (c))
|
||||
coding->fake_multibyte = 1;
|
||||
coding->fake_multibyte = 1;
|
||||
}
|
||||
}
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user