From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 27 Mar 2008 20:04:37 +0000 (+0000)
Subject: (decode_coding_object): Fix last change.
X-Git-Tag: emacs-pretest-23.0.90~6855
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a1567c45444f4eecf007d8c95c49914aafce5202;p=emacs.git

(decode_coding_object): Fix last change.
---

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))
     {