summaryrefslogtreecommitdiff
path: root/lisp/use-package/use-package.el
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2016-02-04 14:00:36 -0500
committerJohn Wiegley <johnw@newartisans.com>2016-02-04 14:00:36 -0500
commit2b967a3c18c9d053f7b071e65a273a2ffd23c6c3 (patch)
tree37d43c774785ab81cec39564698f31bb2fa60ad8 /lisp/use-package/use-package.el
parent9e2dcf8655fc6fe14e03bfe96c33d28dc31a1a12 (diff)
parentc5e98d87dae831d3ed8527bd806f6c4814db8f9b (diff)
downloademacs-2b967a3c18c9d053f7b071e65a273a2ffd23c6c3.tar.gz
emacs-2b967a3c18c9d053f7b071e65a273a2ffd23c6c3.tar.bz2
emacs-2b967a3c18c9d053f7b071e65a273a2ffd23c6c3.zip
Merge pull request from thierryvolpiatto/fix_package_install
When :ensure is used install package as a selected package. GitHub-reference: https://github.com/jwiegley/use-package/issues/314
Diffstat (limited to 'lisp/use-package/use-package.el')
-rw-r--r--lisp/use-package/use-package.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index dcc8842b6e9..98bbc417e65 100644
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -446,7 +446,7 @@ manually updated package."
;;
;; :ensure
;;
-
+(defvar package-archive-contents)
(defun use-package-normalize/:ensure (name keyword args)
(if (null args)
t
@@ -462,7 +462,9 @@ manually updated package."
(if (package-installed-p package)
t
(if (or (assoc package package-archive-contents) no-refresh)
- (package-install package)
+ (if (boundp 'package-selected-packages)
+ (package-install package t)
+ (package-install package))
(progn
(package-refresh-contents)
(use-package-ensure-elpa package t)))))