aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Wiegley2018-11-10 09:58:42 -0800
committerGitHub2018-11-10 09:58:42 -0800
commit77ad44639fed5f9bc1059e46acd437290d2b033a (patch)
tree19f9f14f2a7ccc9812c225aafdc7872af08d4961
parent3f96971febd4fdda5dbde6600168d9ec5c12db90 (diff)
parentfc6fef68692d1a9802a836e13168ebc72b30f36d (diff)
downloademacs-77ad44639fed5f9bc1059e46acd437290d2b033a.tar.gz
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
-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:
1315 args 1315 args
1316 (list args))) 1316 (list args)))
1317 1317
1318(defun use-package-after-count-uses (features) 1318(defun use-package-after-count-uses (features*)
1319 "Count the number of time the body would appear in the result." 1319 "Count the number of time the body would appear in the result."
1320 (cond ((use-package-non-nil-symbolp features) 1320 (cond ((use-package-non-nil-symbolp features*)
1321 1) 1321 1)
1322 ((and (consp features) 1322 ((and (consp features*)
1323 (memq (car features) '(:or :any))) 1323 (memq (car features*) '(:or :any)))
1324 (let ((num 0)) 1324 (let ((num 0))
1325 (cl-dolist (next (cdr features)) 1325 (cl-dolist (next (cdr features*))
1326 (setq num (+ num (use-package-after-count-uses next)))) 1326 (setq num (+ num (use-package-after-count-uses next))))
1327 num)) 1327 num))
1328 ((and (consp features) 1328 ((and (consp features*)
1329 (memq (car features) '(:and :all))) 1329 (memq (car features*) '(:and :all)))
1330 (apply #'max (mapcar #'use-package-after-count-uses 1330 (apply #'max (mapcar #'use-package-after-count-uses
1331 (cdr features)))) 1331 (cdr features*))))
1332 ((listp features) 1332 ((listp features*)
1333 (use-package-after-count-uses (cons :all features))))) 1333 (use-package-after-count-uses (cons :all features*)))))
1334 1334
1335(defun use-package-require-after-load (features body) 1335(defun use-package-require-after-load (features* body)
1336 "Generate `eval-after-load' statements to represents FEATURES. 1336 "Generate `eval-after-load' statements to represents FEATURES*.
1337FEATURES is a list containing keywords `:and' and `:all', where 1337FEATURES* is a list containing keywords `:and' and `:all', where
1338no keyword implies `:all'." 1338no keyword implies `:all'."
1339 (cond 1339 (cond
1340 ((use-package-non-nil-symbolp features) 1340 ((use-package-non-nil-symbolp features*)
1341 `((eval-after-load ',features ',(macroexp-progn body)))) 1341 `((eval-after-load ',features* ',(macroexp-progn body))))
1342 ((and (consp features) 1342 ((and (consp features*)
1343 (memq (car features) '(:or :any))) 1343 (memq (car features*) '(:or :any)))
1344 (cl-mapcan #'(lambda (x) (use-package-require-after-load x body)) 1344 (cl-mapcan #'(lambda (x) (use-package-require-after-load x body))
1345 (cdr features))) 1345 (cdr features*)))
1346 ((and (consp features) 1346 ((and (consp features*)
1347 (memq (car features) '(:and :all))) 1347 (memq (car features*) '(:and :all)))
1348 (cl-dolist (next (cdr features)) 1348 (cl-dolist (next (cdr features*))
1349 (setq body (use-package-require-after-load next body))) 1349 (setq body (use-package-require-after-load next body)))
1350 body) 1350 body)
1351 ((listp features) 1351 ((listp features*)
1352 (use-package-require-after-load (cons :all features) body)))) 1352 (use-package-require-after-load (cons :all features*) body))))
1353 1353
1354(defun use-package-handler/:after (name _keyword arg rest state) 1354(defun use-package-handler/:after (name _keyword arg rest state)
1355 (let ((body (use-package-process-keywords name rest state)) 1355 (let ((body (use-package-process-keywords name rest state))