aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwouter bolsterlee2017-12-20 08:31:56 +0100
committerwouter bolsterlee2017-12-20 08:31:56 +0100
commit1fdfd46fb2c27cb9018afe42e5268b7107ba528b (patch)
tree8100e491234846debf2589199040aa22a5576e12
parent13fb5f4f2e02ef08f8c87017a8eb03d69cd59910 (diff)
downloademacs-1fdfd46fb2c27cb9018afe42e5268b7107ba528b.tar.gz
emacs-1fdfd46fb2c27cb9018afe42e5268b7107ba528b.zip
Fix sanity check for correct :custom-face format
Instead of testing the length of each form passed to :custom-face, the sanity check would test the number of forms passed to :custom-face, causing it to fail when more than 2 face customisations are used. Fixes https://github.com/jwiegley/use-package/issues/600. Copyright-paperwork-exempt: yes
-rw-r--r--lisp/use-package/use-package-core.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index 80f1fe1f1d0..1e52428f522 100644
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@ -1351,7 +1351,7 @@ no keyword implies `:all'."
1351 (spec (nth 1 def))) 1351 (spec (nth 1 def)))
1352 (when (or (not face) 1352 (when (or (not face)
1353 (not spec) 1353 (not spec)
1354 (> (length arg) 2)) 1354 (> (length def) 2))
1355 (use-package-error error-msg)))))) 1355 (use-package-error error-msg))))))
1356 1356
1357(defun use-package-handler/:custom-face (name keyword args rest state) 1357(defun use-package-handler/:custom-face (name keyword args rest state)