Mercurial > emacs
comparison src/coding.c @ 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 | 49c4ea77b83a |
| children | c3fe9ef79b56 |
comparison
equal
deleted
inserted
replaced
| 93196:6344844cc575 | 93197:212fa666680e |
|---|---|
| 7031 && NILP (dst_object))) | 7031 && NILP (dst_object))) |
| 7032 { | 7032 { |
| 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 { |
| 7040 code_conversion_save (0, 0); | 7040 code_conversion_save (0, 0); |
| 7041 coding->dst_object = dst_object; | 7041 coding->dst_object = dst_object; |
| 7046 } | 7046 } |
| 7047 else | 7047 else |
| 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); |
| 7055 | 7055 |
| 7056 if (BUFFERP (coding->dst_object)) | 7056 if (BUFFERP (coding->dst_object)) |