From: Kenichi Handa <handa@m17n.org>
Date: Tue, 7 May 2002 04:51:06 +0000 (+0000)
Subject: (Finsert_file_contents): Set coding_system instead of
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1864^2~925
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=82a2ce2c4dda7506706dab16be925161d9693612;p=emacs.git

(Finsert_file_contents): Set coding_system instead of
val.  If the current buffer is multibyte, always call
decode_coding_gap.
---

diff --git a/src/fileio.c b/src/fileio.c
index 90856d75555..8c4e651455a 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3802,7 +3802,7 @@ actually used.  */)
 	      args[2] = visit, args[3] = beg, args[4] = end, args[5] = replace;
 	      coding_systems = Ffind_operation_coding_system (6, args);
 	      if (CONSP (coding_systems))
-		val = XCAR (coding_systems);
+		coding_system = XCAR (coding_systems);
 	    }
 	}
 
@@ -4412,7 +4412,8 @@ actually used.  */)
 	current_buffer->enable_multibyte_characters = Qnil;
     }
 
-  if ((CODING_REQUIRE_DETECTION (&coding)
+  if ((! NILP (current_buffer->enable_multibyte_characters)
+       || CODING_REQUIRE_DETECTION (&coding)
        || CODING_REQUIRE_DECODING (&coding))
       && (inserted > 0 || CODING_REQUIRE_FLUSHING (&coding)))
     {