(decode_coding_object): Fix last change.

diff --git a/src/ChangeLog b/src/ChangeLog
index c04ca11131c7b09b89ad5c7ee21aeb201efa9d04..e38d0935031b26f181a151eaac0df2d05a7cfec2 100644 (file)
--- 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 6848fa674d3b9e8db686398e0ddab08887276c9d..01a678e2eaf50c1515d6b1771733a2cfad620ae6 100644 (file)
--- 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))
     {