(Finsert_file_contents): Call Fset_buffer_multibyte

unconfitionally.

diff --git a/src/ChangeLog b/src/ChangeLog
index ef43d1d080769f65ed1143f72b281ef3106d8ea0..dba6e5b2023000aa95a079e02344ae7e59e5be53 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-27  Gerd Moellmann  <gerd@gnu.org>
+
+       * fileio.c (Finsert_file_contents): Call Fset_buffer_multibyte
+       unconditionally.
+
 2001-08-24  Gerd Moellmann  <gerd@gnu.org>
 
        * keymap.c (access_keymap): Return the cdr of the binding of

diff --git a/src/fileio.c b/src/fileio.c
index c9fe583406036d710ef63ab6d89878bdbab471a6..39850dcc45cf17884e40b62fa964b3bf8d96e651 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4344,16 +4344,10 @@ actually used.")
          || coding.type == coding_type_raw_text))
     {
       /* Visiting a file with these coding systems should always make
-        the buffer unibyte.  If we happen to be replacing text in a
-        multibyte buffer (this happens when reverting an RMAIL
-        buffer), positions in the buffer, markers etc. may have byte
-        positions != character positions, so just setting
-        enable_multibyte_characters to nil doesn't suffice.  */
-      if (!NILP (replace)
-         && !NILP (current_buffer->enable_multibyte_characters))
-       Fset_buffer_multibyte (Qnil);
-      else
-       current_buffer->enable_multibyte_characters = Qnil;
+        the buffer unibyte.  The call to Fset_buffer_multibyte
+        ensures that existing markers etc are converted to unibyte,
+        too.  */
+      Fset_buffer_multibyte (Qnil);
       coding.dst_multibyte = 0;
     }