(Finsert_file_contents): Even if we read into a

unibyte buffer, check if we must decode the result or not.

diff --git a/src/ChangeLog b/src/ChangeLog
index 651026fe86b73beebc0e4e98950f046498a6f153..f629b4ec74f2af41fd9a607dfe40d9eeb63a157e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -6,6 +6,9 @@
        respectively.
        (decode_coding_gap): Run post-read-conversion if any.
 
+       * fileio.c (Finsert_file_contents): Even if we read into a
+       unibyte buffer, check if we must decode the result or not.
+
 2003-05-29  Kenichi Handa  <handa@m17n.org>
 
        * coding.c (make_conversion_work_buffer): Change the work buffer

diff --git a/src/fileio.c b/src/fileio.c
index 24a3377f8e8d69a62a9270e9f7ef0e568a7bc8f8..86ac8a32570f32f3d3acae0d9440d09f69fa1ace 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4428,8 +4428,7 @@ actually used.  */)
        current_buffer->enable_multibyte_characters = Qnil;
     }
 
-  if ((! NILP (current_buffer->enable_multibyte_characters)
-       || CODING_REQUIRE_DETECTION (&coding)
+  if ((CODING_REQUIRE_DETECTION (&coding)
        || CODING_REQUIRE_DECODING (&coding))
       && (inserted > 0 || CODING_REQUIRE_FLUSHING (&coding)))
     {