summaryrefslogtreecommitdiff
path: root/lisp/use-package/use-package-core.el
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2018-11-10 09:58:42 -0800
committerGitHub <noreply@github.com>2018-11-10 09:58:42 -0800
commit77ad44639fed5f9bc1059e46acd437290d2b033a (patch)
tree19f9f14f2a7ccc9812c225aafdc7872af08d4961 /lisp/use-package/use-package-core.el
parent3f96971febd4fdda5dbde6600168d9ec5c12db90 (diff)
parentfc6fef68692d1a9802a836e13168ebc72b30f36d (diff)
downloademacs-77ad44639fed5f9bc1059e46acd437290d2b033a.tar.gz
emacs-77ad44639fed5f9bc1059e46acd437290d2b033a.tar.bz2
emacs-77ad44639fed5f9bc1059e46acd437290d2b033a.zip
Merge pull request from tarsiiformes/silencio
Silence byte-compiler on Emacs 25 GitHub-reference: https://github.com/jwiegley/use-package/issues/733
Diffstat (limited to 'lisp/use-package/use-package-core.el')
-rw-r--r--lisp/use-package/use-package-core.el46
1 files changed, 23 insertions, 23 deletions
diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index 525b478313b..51746b3fff6 100644
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@ -1315,41 +1315,41 @@ meaning:
args
(list args)))
-(defun use-package-after-count-uses (features)
+(defun use-package-after-count-uses (features*)
"Count the number of time the body would appear in the result."
- (cond ((use-package-non-nil-symbolp features)
+ (cond ((use-package-non-nil-symbolp features*)
1)
- ((and (consp features)
- (memq (car features) '(:or :any)))
+ ((and (consp features*)
+ (memq (car features*) '(:or :any)))
(let ((num 0))
- (cl-dolist (next (cdr features))
+ (cl-dolist (next (cdr features*))
(setq num (+ num (use-package-after-count-uses next))))
num))
- ((and (consp features)
- (memq (car features) '(:and :all)))
+ ((and (consp features*)
+ (memq (car features*) '(:and :all)))
(apply #'max (mapcar #'use-package-after-count-uses
- (cdr features))))
- ((listp features)
- (use-package-after-count-uses (cons :all features)))))
+ (cdr features*))))
+ ((listp features*)
+ (use-package-after-count-uses (cons :all features*)))))
-(defun use-package-require-after-load (features body)
- "Generate `eval-after-load' statements to represents FEATURES.
-FEATURES is a list containing keywords `:and' and `:all', where
+(defun use-package-require-after-load (features* body)
+ "Generate `eval-after-load' statements to represents FEATURES*.
+FEATURES* is a list containing keywords `:and' and `:all', where
no keyword implies `:all'."
(cond
- ((use-package-non-nil-symbolp features)
- `((eval-after-load ',features ',(macroexp-progn body))))
- ((and (consp features)
- (memq (car features) '(:or :any)))
+ ((use-package-non-nil-symbolp features*)
+ `((eval-after-load ',features* ',(macroexp-progn body))))
+ ((and (consp features*)
+ (memq (car features*) '(:or :any)))
(cl-mapcan #'(lambda (x) (use-package-require-after-load x body))
- (cdr features)))
- ((and (consp features)
- (memq (car features) '(:and :all)))
- (cl-dolist (next (cdr features))
+ (cdr features*)))
+ ((and (consp features*)
+ (memq (car features*) '(:and :all)))
+ (cl-dolist (next (cdr features*))
(setq body (use-package-require-after-load next body)))
body)
- ((listp features)
- (use-package-require-after-load (cons :all features) body))))
+ ((listp features*)
+ (use-package-require-after-load (cons :all features*) body))))
(defun use-package-handler/:after (name _keyword arg rest state)
(let ((body (use-package-process-keywords name rest state))