mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-29 08:31:35 -08:00
Code Issues Projects Releases Wiki Activity

Ensure package-pinned-packages is bound before referencing it

Browse source 
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
This commit is contained in:
Mike Appleby 2016-08-14 22:43:36 -05:00
parent 4629e86240
commit ef0cbfdc73
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/use-package/use-package.el
View 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)