mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 14:30:50 -08:00
Code Issues Projects Releases Wiki Activity

Code reformatting

Browse source
This commit is contained in:
John Wiegley 2017-11-30 20:35:29 -08:00
parent dfd3194d80
commit 0791e3fefe
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,8 +42,9 @@
(require 'bind-key) (require 'bind-key)
(require 'bytecomp) (require 'bytecomp)
(require 'cl-lib) (require 'cl-lib)
(eval-when-compile (require 'cl)) (eval-when-compile
(eval-when-compile (require 'regexp-opt)) (require 'cl)
(require 'regexp-opt))
(declare-function package-installed-p "package") (declare-function package-installed-p "package")
(declare-function package-read-all-archive-contents "package" ()) (declare-function package-read-all-archive-contents "package" ())
@ -683,11 +684,8 @@ If the package is installed, its entry is removed from
(if packages (if packages
(list (list
(intern (intern
(completing-read (completing-read "Select package: "
"Select package: " packages nil 'require-match))
packages
nil
'require-match))
:interactive) :interactive)
(user-error "No packages with deferred installation")))) (user-error "No packages with deferred installation"))))
(let ((spec (gethash name use-package--deferred-packages))) (let ((spec (gethash name use-package--deferred-packages)))
@ -960,7 +958,7 @@ If ALLOW-EMPTY is non-nil, it's OK for ARGS to be an empty list."
(defun use-package-handler/:preface (name keyword arg rest state) (defun use-package-handler/:preface (name keyword arg rest state)
(let ((body (use-package-process-keywords name rest state))) (let ((body (use-package-process-keywords name rest state)))
(use-package-concat (use-package-concat
(unless (null arg) (when arg
`((eval-and-compile ,@arg))) `((eval-and-compile ,@arg)))
body))) body)))
@ -1450,11 +1448,13 @@ representing symbols (that may need to be autloaded)."
(unless (or (null config-body) (equal config-body '(t))) (unless (or (null config-body) (equal config-body '(t)))
`((eval-after-load ,(if (symbolp name) `',name name) `((eval-after-load ,(if (symbolp name) `',name name)
',(macroexp-progn config-body)))) ',(macroexp-progn config-body))))
;; Here we are checking the marker value for deferred
;; installation set in `use-package-handler/:ensure'. See also ;; Here we are checking the marker value for deferred installation set
;; in `use-package-handler/:ensure'. See also
;; `use-package-handler/:defer-install'. ;; `use-package-handler/:defer-install'.
(when (eq (plist-get state :defer-install) :ensure) (when (eq (plist-get state :defer-install) :ensure)
(use-package-install-deferred-package name :config)) (use-package-install-deferred-package name :config))
(use-package--with-elapsed-timer (use-package--with-elapsed-timer
(format "Loading package %s" name) (format "Loading package %s" name)
(if use-package-expand-minimally (if use-package-expand-minimally