Mercurial > emacs
changeset 93197:212fa666680e
(decode_coding_object): When not decoding into a buffer,
obey the coding system's preference of (uni|multi)byte.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 25 Mar 2008 16:02:32 +0000 |
| parents | 6344844cc575 |
| children | eb3d659f5085 |
| files | src/ChangeLog src/coding.c |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Mar 25 15:47:02 2008 +0000 +++ b/src/ChangeLog Tue Mar 25 16:02:32 2008 +0000 @@ -1,3 +1,8 @@ +2008-03-25 Stefan Monnier <monnier@iro.umontreal.ca> + + * coding.c (decode_coding_object): When not decoding into a buffer, + obey the coding system's preference of (uni|multi)byte. + 2008-03-24 Stefan Monnier <monnier@iro.umontreal.ca> * casefiddle.c (casify_object): Avoid pathological N^2 worst case if
--- a/src/coding.c Tue Mar 25 15:47:02 2008 +0000 +++ b/src/coding.c Tue Mar 25 16:02:32 2008 +0000 @@ -7033,7 +7033,7 @@ coding->dst_object = code_conversion_save (1, 1); coding->dst_pos = BEG; coding->dst_pos_byte = BEG_BYTE; - coding->dst_multibyte = 1; + coding->dst_multibyte = !CODING_FOR_UNIBYTE (coding); } else if (BUFFERP (dst_object)) { @@ -7048,7 +7048,7 @@ { code_conversion_save (0, 0); coding->dst_object = Qnil; - coding->dst_multibyte = 1; + coding->dst_multibyte = !CODING_FOR_UNIBYTE (coding); } decode_coding (coding);