From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 11 Dec 2015 08:25:37 +0000 (+0200)
Subject: Fix setting buffer unibyte when reading from a device
X-Git-Tag: emacs-25.0.90~502
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b3277c7d3913ccedfac36c27ab657901e4f131b4;p=emacs.git

Fix setting buffer unibyte when reading from a device

* src/fileio.c (Finsert_file_contents): Call Fset_buffer_multibyte
to make a (possibly non-empty) buffer unibyte.  (Bug#22096)
---

diff --git a/src/fileio.c b/src/fileio.c
index 6cda1e39eed..8e44eb0d539 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4265,7 +4265,7 @@ by calling `format-decode', which see.  */)
 	  && NILP (replace))
 	/* Visiting a file with these coding system makes the buffer
 	   unibyte.  */
-	bset_enable_multibyte_characters (current_buffer, Qnil);
+	Fset_buffer_multibyte (Qnil);
     }
 
   coding.dst_multibyte = ! NILP (BVAR (current_buffer, enable_multibyte_characters));