about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2022-01-05 18:19:47 -0600
committerCase Duckworth2022-01-05 18:19:47 -0600
commit724c0a6fce9a08162124b862e1aa9dfa02ed80ad (patch)
tree039443624cd52715e6b0271e2b1e2be155913d7d
parentLots of changes, maybe breaking something (diff)
downloademacs-724c0a6fce9a08162124b862e1aa9dfa02ed80ad.tar.gz
emacs-724c0a6fce9a08162124b862e1aa9dfa02ed80ad.zip
Fix :setup form
I had to end the `ignore-errors' form with t
-rw-r--r--lisp/+setup.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/+setup.el b/lisp/+setup.el index c6bcb9e..fbd9d61 100644 --- a/lisp/+setup.el +++ b/lisp/+setup.el
@@ -33,9 +33,9 @@
33(setup-define :load-after 33(setup-define :load-after
34 (lambda (&rest features) 34 (lambda (&rest features)
35 (let ((body `(require ',(setup-get 'feature)))) 35 (let ((body `(require ',(setup-get 'feature))))
36 (dolist (feature (nreverse features)) 36 (dolist (feature (nreverse features))
37 (setq body `(with-eval-after-load ',feature ,body))) 37 (setq body `(with-eval-after-load ',feature ,body)))
38 body)) 38 body))
39 :documentation "Load the current feature after FEATURES.") 39 :documentation "Load the current feature after FEATURES.")
40 40
41(setup-define :also-straight 41(setup-define :also-straight
@@ -47,8 +47,8 @@
47 47
48(setup-define :straight 48(setup-define :straight
49 (lambda (recipe) 49 (lambda (recipe)
50 `(unless (ignore-errors (straight-use-package ',recipe)) 50 `(unless (ignore-errors (straight-use-package ',recipe) t)
51 ,(setup-quit))) 51 ,(setup-quit)))
52 :documentation 52 :documentation
53 "Install RECIPE with `straight-use-package'. 53 "Install RECIPE with `straight-use-package'.
54This macro can be used as HEAD, and will replace itself with the 54This macro can be used as HEAD, and will replace itself with the
@@ -63,7 +63,7 @@ first RECIPE's package."
63(setup-define :straight-when 63(setup-define :straight-when
64 (lambda (recipe condition) 64 (lambda (recipe condition)
65 `(unless (and ,condition 65 `(unless (and ,condition
66 (straight-use-package ',recipe)) 66 (ignore-errors (straight-use-package ',recipe) t))
67 ,(setup-quit))) 67 ,(setup-quit)))
68 :documentation 68 :documentation
69 "Install RECIPE with `straight-use-package' when CONDITION is met. 69 "Install RECIPE with `straight-use-package' when CONDITION is met.