diff options
| author | Stefan Monnier | 2008-03-25 16:02:32 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-03-25 16:02:32 +0000 |
| commit | 72d5003de7f3b317ef556d546c25d36b37f33d15 (patch) | |
| tree | 66fbbb603dcf5adf4689b293a4c5c7edd15bb632 /src/coding.c | |
| parent | dd0d723c8e8f7e911502b27bdb152593024bb2cf (diff) | |
| download | emacs-72d5003de7f3b317ef556d546c25d36b37f33d15.tar.gz emacs-72d5003de7f3b317ef556d546c25d36b37f33d15.zip | |
(decode_coding_object): When not decoding into a buffer,
obey the coding system's preference of (uni|multi)byte.
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/coding.c b/src/coding.c index 901f81a9247..6848fa674d3 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -7033,7 +7033,7 @@ decode_coding_object (coding, src_object, from, from_byte, to, to_byte, | |||
| 7033 | coding->dst_object = code_conversion_save (1, 1); | 7033 | coding->dst_object = code_conversion_save (1, 1); |
| 7034 | coding->dst_pos = BEG; | 7034 | coding->dst_pos = BEG; |
| 7035 | coding->dst_pos_byte = BEG_BYTE; | 7035 | coding->dst_pos_byte = BEG_BYTE; |
| 7036 | coding->dst_multibyte = 1; | 7036 | coding->dst_multibyte = !CODING_FOR_UNIBYTE (coding); |
| 7037 | } | 7037 | } |
| 7038 | else if (BUFFERP (dst_object)) | 7038 | else if (BUFFERP (dst_object)) |
| 7039 | { | 7039 | { |
| @@ -7048,7 +7048,7 @@ decode_coding_object (coding, src_object, from, from_byte, to, to_byte, | |||
| 7048 | { | 7048 | { |
| 7049 | code_conversion_save (0, 0); | 7049 | code_conversion_save (0, 0); |
| 7050 | coding->dst_object = Qnil; | 7050 | coding->dst_object = Qnil; |
| 7051 | coding->dst_multibyte = 1; | 7051 | coding->dst_multibyte = !CODING_FOR_UNIBYTE (coding); |
| 7052 | } | 7052 | } |
| 7053 | 7053 | ||
| 7054 | decode_coding (coding); | 7054 | decode_coding (coding); |