]> git.eshelyaron.com Git - emacs.git/commitdiff
Ensure package-pinned-packages is bound before referencing it
authorMike Appleby <mike@app.leby.org>
Mon, 15 Aug 2016 03:43:36 +0000 (22:43 -0500)
committerMike Appleby <mike@app.leby.org>
Mon, 15 Aug 2016 16:48:33 +0000 (11:48 -0500)
Add a bound-and-true-p guard to package-pinned-packages before
referencing it in use-package-ensure-elpa.

Package pinning was introduced in Emacs 24.4, and hence
package-pinned-packages in unbound by default in earlier versions.

Relevant commits:
 72452b5 Merge pull request https://github.com/jwiegley/use-package/issues/367 from ketbra/master
 5053f75 Make pin and ensure compatible

Fixes https://github.com/jwiegley/use-package/issues/375

Copyright-paperwork-exempt: yes

lisp/use-package/use-package.el

index a2f9883a110657358407c665954c80782df90e2e..427945ff5b034c37ca1a95734ef84314ec107438 100644 (file)
@@ -500,7 +500,8 @@ manually updated package."
 (defun use-package-ensure-elpa (package &optional no-refresh)
   (if (package-installed-p package)
       t
-    (if (and (not no-refresh) (assoc package package-pinned-packages))
+    (if (and (not no-refresh)
+             (assoc package (bound-and-true-p package-pinned-packages)))
         (package-read-all-archive-contents))
     (if (or (assoc package package-archive-contents) no-refresh)
         (package-install package)