Mercurial > emacs

changeset 88457:478d6f47e263

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Finsert_file_contents): Set coding_system instead of val. If the current buffer is multibyte, always call decode_coding_gap.
author Kenichi Handa <handa@m17n.org>
date Tue, 07 May 2002 04:51:06 +0000
parents a7b309f72920
children 49710fa82951
files src/fileio.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/fileio.c	Tue May 07 04:50:48 2002 +0000
+++ b/src/fileio.c	Tue May 07 04:51:06 2002 +0000
@@ -3802,7 +3802,7 @@
 	      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 @@
 	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)))
     {