summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog4
-rw-r--r--src/coding.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c04ca11131c..e38d0935031 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-27 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * coding.c (decode_coding_object): Fix last change.
+
2008-03-27 Jason Rumney <jasonr@gnu.org>
* w32fns.c (start_hourglass): Suppress hourglass on tty frames.
diff --git a/src/coding.c b/src/coding.c
index 6848fa674d3..01a678e2eaf 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -7030,10 +7030,10 @@ decode_coding_object (coding, src_object, from, from_byte, to, to_byte,
|| (! NILP (CODING_ATTR_POST_READ (attrs))
&& NILP (dst_object)))
{
- coding->dst_object = code_conversion_save (1, 1);
+ coding->dst_multibyte = !CODING_FOR_UNIBYTE (coding);
+ coding->dst_object = code_conversion_save (1, coding->dst_multibyte);
coding->dst_pos = BEG;
coding->dst_pos_byte = BEG_BYTE;
- coding->dst_multibyte = !CODING_FOR_UNIBYTE (coding);
}
else if (BUFFERP (dst_object))
{