Merge branch 'emacs-25-merge'

[gnu-emacs] / src / fileio.c

diff --git a/src/fileio.c b/src/fileio.c
index 8e44eb0d53967f283ccaad8fc42d3bb8107bc720..e18ddb1a7aa482a6ee7eafc1cf4442364a0c3a1a 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4263,9 +4263,14 @@ by calling `format-decode', which see.  */)
       if (CODING_FOR_UNIBYTE (&coding)
          /* Can't do this if part of the buffer might be preserved.  */
          && NILP (replace))
-       /* Visiting a file with these coding system makes the buffer
-          unibyte.  */
-       Fset_buffer_multibyte (Qnil);
+       {
+         /* Visiting a file with these coding system makes the buffer
+            unibyte.  */
+         if (inserted > 0)
+           bset_enable_multibyte_characters (current_buffer, Qnil);
+         else
+           Fset_buffer_multibyte (Qnil);
+       }
     }
 
   coding.dst_multibyte = ! NILP (BVAR (current_buffer, enable_multibyte_characters));