diff options
| author | David Elsing <[email protected]> | 2025-03-04 20:33:08 +0000 |
|---|---|---|
| committer | Ludovic Courtès <[email protected]> | 2025-03-05 00:28:49 +0100 |
| commit | 30e51cb6b42e86f9f94d6380f69a1020ee99ff39 (patch) | |
| tree | 6bcf2847774381f7c3a102c1a0ae143ee97d9879 /.dir-locals.el | |
| parent | 749eb1a2dd9fdf63a71f223b3f6756d9cb5940e6 (diff) | |
gexp: ‘with-parameters’ properly handles ‘%graft?’.
Fixes <https://issues.guix.gnu.org/75879>.
* .dir-locals.el (scheme-mode): Remove mparameterize indentation rules.
Add state-parameterize and store-parameterize indentation rules.
* etc/manifests/system-tests.scm (test-for-current-guix): Replace
mparameterize with store-parameterize.
* etc/manifests/time-travel.scm (guix-instance-compiler): Likewise.
* gnu/tests.scm (compile-system-test): Likewise.
* guix/gexp.scm (compile-parameterized): Use state-call-with-parameters.
* guix/monads.scm (mparameterize): Remove macro.
(state-call-with-parameters): New procedure.
(state-parameterize): New macro.
* guix/store.scm (store-parameterize): New macro.
* tests/gexp.scm ("with-parameters for %graft?"): New test.
* tests/monads.scm ("mparameterize"): Remove test.
("state-parameterize"): New test.
Co-authored-by: Ludovic Courtès <[email protected]>
Change-Id: I0c74066ca3f37072815b073fb3039925488a9645
Signed-off-by: Ludovic Courtès <[email protected]>
Diffstat (limited to '.dir-locals.el')
| -rw-r--r-- | .dir-locals.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.dir-locals.el b/.dir-locals.el index d629b51c8a..76c9e12992 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -138,7 +138,8 @@ (eval . (put 'munless 'scheme-indent-function 1)) (eval . (put 'mlet* 'scheme-indent-function 2)) (eval . (put 'mlet 'scheme-indent-function 2)) - (eval . (put 'mparameterize 'scheme-indent-function 2)) + (eval . (put 'state-parameterize 'scheme-indent-function 2)) + (eval . (put 'store-parameterize 'scheme-indent-function 2)) (eval . (put 'run-with-store 'scheme-indent-function 1)) (eval . (put 'run-with-state 'scheme-indent-function 1)) (eval . (put 'wrap-program 'scheme-indent-function 1)) |