From: Gerd Moellmann <gerd@gnu.org>
Date: Mon, 27 Aug 2001 09:15:57 +0000 (+0000)
Subject: (Finsert_file_contents): Call Fset_buffer_multibyte
X-Git-Tag: emacs-pretest-21.0.105~68
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=32171635b95099c3cfc28fe0d004c935584655aa;p=emacs.git

(Finsert_file_contents): Call Fset_buffer_multibyte
unconfitionally.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ef43d1d0807..dba6e5b2023 100644
--- 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 c9fe5834060..39850dcc45c 100644
--- 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;
     }