masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-05 03:39:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request from raxod502/use-package-ensure-function

Browse source 
Add use-package-ensure-function
GitHub-reference: https://github.com/jwiegley/use-package/issues/427
This commit is contained in:
John Wiegley 2017-01-16 13:09:23 -08:00 • committed by GitHub
commit c637f2be43
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lisp/use-package/use-package.el
View file

@ -182,6 +182,16 @@ Must be set before loading use-package."
:type 'boolean :type 'boolean
:group 'use-package) :group 'use-package)
(defcustom use-package-ensure-function 'use-package-ensure-elpa
"Function that ensures a package is installed.
This function is called with one argument, the package name as a
symbol, by the `:ensure' keyword.
The default value uses package.el to install the package."
:type '(choice (const :tag "package.el" use-package-ensure-elpa)
(function :tag "Custom"))
:group 'use-package)
(when use-package-enable-imenu-support (when use-package-enable-imenu-support
;; Not defined in Emacs 24 ;; Not defined in Emacs 24
(defvar lisp-mode-symbol-regexp (defvar lisp-mode-symbol-regexp
@ -504,6 +514,7 @@ manually updated package."
"(an unquoted symbol name)"))))))) "(an unquoted symbol name)")))))))
(defun use-package-ensure-elpa (package &optional no-refresh) (defun use-package-ensure-elpa (package &optional no-refresh)
(require 'package)
(if (package-installed-p package) (if (package-installed-p package)
t t
(if (and (not no-refresh) (if (and (not no-refresh)
@ -518,9 +529,8 @@ manually updated package."
(defun use-package-handler/:ensure (name keyword ensure rest state) (defun use-package-handler/:ensure (name keyword ensure rest state)
(let* ((body (use-package-process-keywords name rest state)) (let* ((body (use-package-process-keywords name rest state))
(package-name (or (and (eq ensure t) (use-package-as-symbol name)) ensure)) (package-name (or (and (eq ensure t) (use-package-as-symbol name)) ensure))
(ensure-form (if package-name (ensure-form (when package-name
`(progn (require 'package) `(,use-package-ensure-function ',package-name))))
(use-package-ensure-elpa ',package-name)))))
;; We want to avoid installing packages when the `use-package' ;; We want to avoid installing packages when the `use-package'
;; macro is being macro-expanded by elisp completion (see ;; macro is being macro-expanded by elisp completion (see
;; `lisp--local-variables'), but still do install packages when ;; `lisp--local-variables'), but still do install packages when