From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 24 May 2019 16:26:14 +0000 (-0400)
Subject: * lisp/emacs-lisp/package.el (package-install-from-archive): Fix last change
X-Git-Tag: emacs-27.0.90~2802
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=35f305652c9eacb2e75fa6bcd784247d4de939fb;p=emacs.git

* lisp/emacs-lisp/package.el (package-install-from-archive): Fix last change

Don't place the unibyte content of of the downloaded file into
a multibyte buffer.
---

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 6b929160950..670831d9630 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1913,9 +1913,12 @@ if all the in-between dependencies are also in PACKAGE-LIST."
            ;; This function will be called after signature checking.
            (lambda (&optional good-sigs)
              ;; Signature checked, unpack now.
-             (with-temp-buffer (insert content)
-                               (let ((save-silently t))
-                                 (package-unpack pkg-desc)))
+             (with-temp-buffer ;FIXME: Just use the previous current-buffer.
+               (set-buffer-multibyte nil)
+               (cl-assert (not (multibyte-string-p content)))
+               (insert content)
+               (let ((save-silently t))
+                 (package-unpack pkg-desc)))
              ;; Here the package has been installed successfully, mark it as
              ;; signed if appropriate.
              (when good-sigs