[Emacs-diffs] Changes to emacs/lisp/international/mule.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/03/19 01:56:48

Index: international/mule.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/international/mule.el,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -b -r1.267 -r1.268
--- international/mule.el       16 Mar 2008 01:51:01 -0000      1.267
+++ international/mule.el       19 Mar 2008 01:56:17 -0000      1.268
@@ -310,12 +310,7 @@
     (let* ((buffer
            ;; To avoid any autoloading, set default-major-mode to
            ;; fundamental-mode.
-           ;; So that we don't get completely screwed if the
-           ;; file is encoded in some complicated character set,
-           ;; read it with real decoding, as a multibyte buffer,
-           ;; even if this is a --unibyte Emacs session.
-           (let ((default-major-mode 'fundamental-mode)
-                 (default-enable-multibyte-characters t))
+           (let ((default-major-mode 'fundamental-mode))
              ;; We can't use `generate-new-buffer' because files.el
              ;; is not yet loaded.
              (get-buffer-create (generate-new-buffer-name " *load*"))))
@@ -332,6 +327,11 @@
                (set-auto-coding-for-load t)
                (inhibit-file-name-operation nil))
            (with-current-buffer buffer
+              ;; So that we don't get completely screwed if the
+              ;; file is encoded in some complicated character set,
+              ;; read it with real decoding, as a multibyte buffer,
+              ;; even if this is a --unibyte Emacs session.
+              (set-buffer-multibyte t)
              ;; Don't let deactivate-mark remain set.
              (let (deactivate-mark)
                (insert-file-contents fullname))