diff options
| author | Stefan Monnier | 2019-05-24 12:26:14 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2019-05-24 12:26:40 -0400 |
| commit | 35f305652c9eacb2e75fa6bcd784247d4de939fb (patch) | |
| tree | b3780aba8c44e1fca322628822fff7508b88d1b5 /lisp | |
| parent | 43db6dd6b4cc9445eacbb39181fefd0ead9ba98d (diff) | |
| download | emacs-35f305652c9eacb2e75fa6bcd784247d4de939fb.tar.gz 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')
| -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." | |||
| 1913 | ;; This function will be called after signature checking. | 1913 | ;; This function will be called after signature checking. |
| 1914 | (lambda (&optional good-sigs) | 1914 | (lambda (&optional good-sigs) |
| 1915 | ;; Signature checked, unpack now. | 1915 | ;; Signature checked, unpack now. |
| 1916 | (with-temp-buffer (insert content) | 1916 | (with-temp-buffer ;FIXME: Just use the previous current-buffer. |
| 1917 | (let ((save-silently t)) | 1917 | (set-buffer-multibyte nil) |
| 1918 | (package-unpack pkg-desc))) | 1918 | (cl-assert (not (multibyte-string-p content))) |
| 1919 | (insert content) | ||
| 1920 | (let ((save-silently t)) | ||
| 1921 | (package-unpack pkg-desc))) | ||
| 1919 | ;; Here the package has been installed successfully, mark it as | 1922 | ;; Here the package has been installed successfully, mark it as |
| 1920 | ;; signed if appropriate. | 1923 | ;; signed if appropriate. |
| 1921 | (when good-sigs | 1924 | (when good-sigs |