diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-05-24 12:26:14 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-05-24 12:26:40 -0400 |
| commit | 35f305652c9eacb2e75fa6bcd784247d4de939fb (patch) | |
| tree | b3780aba8c44e1fca322628822fff7508b88d1b5 /lisp/emacs-lisp/package.el | |
| parent | 43db6dd6b4cc9445eacbb39181fefd0ead9ba98d (diff) | |
| download | emacs-35f305652c9eacb2e75fa6bcd784247d4de939fb.tar.gz emacs-35f305652c9eacb2e75fa6bcd784247d4de939fb.tar.bz2 emacs-35f305652c9eacb2e75fa6bcd784247d4de939fb.zip | |
* 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.
Diffstat (limited to 'lisp/emacs-lisp/package.el')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 9 |
1 files changed, 6 insertions, 3 deletions
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 |