From: Glenn Morris <rgm@gnu.org>
Date: Tue, 3 Jul 2018 02:19:05 +0000 (-0700)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~4730
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=98e98b42a09d7c2c74e9bf58f6eea19086f42e6e;p=emacs.git

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)
---

98e98b42a09d7c2c74e9bf58f6eea19086f42e6e
diff --cc lisp/emacs-lisp/package.el
index 9a704b2d98c,576a9bc7e73..362335220f0
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@@ -1554,9 -1530,9 +1554,9 @@@ similar to an entry in `package-alist'
      (let* ((location (cdr archive))
             (name (car archive))
             (content (buffer-string))
 -           (dir (expand-file-name (format "archives/%s" name) package-user-dir))
 +           (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))