diff options
author | Glenn Morris <rgm@gnu.org> | 2018-07-02 19:19:05 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2018-07-02 19:19:05 -0700 |
commit | 98e98b42a09d7c2c74e9bf58f6eea19086f42e6e (patch) | |
tree | b28b326043ea9a3ee431a741740222c0c9f94508 /lisp/emacs-lisp | |
parent | 332f4656b019b58fed1de6e35769e83ff190908d (diff) | |
parent | d008ef3d0b4aaa83d9ee105450fdcf13aa63a7e3 (diff) | |
download | emacs-98e98b42a09d7c2c74e9bf58f6eea19086f42e6e.tar.gz emacs-98e98b42a09d7c2c74e9bf58f6eea19086f42e6e.tar.bz2 emacs-98e98b42a09d7c2c74e9bf58f6eea19086f42e6e.zip |
Merge from origin/emacs-26
d008ef3 * src/xdisp.c (Vmouse_autoselect_window): Clarify doc-string ...
6f6d525 Detect a non-list package archive content properly (Bug#22311)
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r-- | lisp/emacs-lisp/package.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 9a704b2d98c..362335220f0 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1556,7 +1556,7 @@ similar to an entry in `package-alist'. Save the cached copy to (content (buffer-string)) (dir (expand-file-name (concat "archives/" name) package-user-dir)) (local-file (expand-file-name file dir))) - (when (listp (read-from-string content)) + (when (listp (read content)) (make-directory dir t) (if (or (not package-check-signature) (member name package-unsigned-archives)) |