1 files changed, 6 insertions, 0 deletions

diff --git a/lisp/files.el b/lisp/files.el
index 549bd1de8a0..ac1712229fd 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3305,6 +3305,12 @@ non-nil, it is called instead of rereading visited file contents."
                           ;; any code conversion.
                           (if auto-save-p 'emacs-mule-unix
                             coding-system-for-read)))
+                     ;; This force
+                     ;; after-insert-file-set-buffer-file-coding-system
+                     ;; (called from insert-file-contents) to set
+                     ;; buffer-file-coding-system to a proper value.
+                     (kill-local-variable 'buffer-file-coding-system)
+
                      ;; Note that this preserves point in an intelligent way.
                      (if preserve-modes
                          (let ((buffer-file-format buffer-file-format))