summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2008-03-27 20:24:55 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2008-03-27 20:24:55 +0000
commit0154725e48b709be3cd06628fccaa2e4f46af441 (patch)
tree5fd850418e454a3898319122c464c3e1e988c9e0
parenta1567c45444f4eecf007d8c95c49914aafce5202 (diff)
downloademacs-0154725e48b709be3cd06628fccaa2e4f46af441.tar.gz
emacs-0154725e48b709be3cd06628fccaa2e4f46af441.tar.bz2
emacs-0154725e48b709be3cd06628fccaa2e4f46af441.zip
(decode_coding_object): Revert part of last change.
-rw-r--r--src/coding.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/coding.c b/src/coding.c
index 01a678e2eaf..d862ed133ab 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -7048,7 +7048,10 @@ decode_coding_object (coding, src_object, from, from_byte, to, to_byte,
{
code_conversion_save (0, 0);
coding->dst_object = Qnil;
- coding->dst_multibyte = !CODING_FOR_UNIBYTE (coding);
+ /* Most callers presume this will return a multibyte result, and they
+ won't use `binary' or `raw-text' anyway, so let's not worry about
+ CODING_FOR_UNIBYTE. */
+ coding->dst_multibyte = Qt;
}
decode_coding (coding);