[bug#53505] [PATCH] .dir-locals.el: Don't mess up indentation of prepend and append.

[bug#53505] [PATCH] .dir-locals.el: Don't mess up indentation of prepend and append.

[Liliana Marie Prikler]

The current version appears to assume special values in the first and second
package, but it's either all lists (default append) or all package input
expressions (inside modify-inputs), which themselves are either packages
or a list consisting of a package and a string.

* .dir-locals.el: Drop (eval . (put 'prepend 'scheme-indent-function 2))
and (eval . (put 'append 'scheme-indent-function 2)).
---
 .dir-locals.el | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.dir-locals.el b/.dir-locals.el
index 12a6f08739..0edf2a8d23 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -60,8 +60,6 @@
    ;; 'modify-inputs' and its keywords.
    (eval . (put 'modify-inputs 'scheme-indent-function 1))
    (eval . (put 'replace 'scheme-indent-function 1))
-   (eval . (put 'prepend 'scheme-indent-function 2))
-   (eval . (put 'append 'scheme-indent-function 2))
 
    ;; 'modify-phases' and its keywords.
    (eval . (put 'modify-phases 'scheme-indent-function 1))
-- 
2.34.0

[bug#53505] [PATCH] .dir-locals.el: Don't mess up indentation of prepend and append.

[Ludovic Courtès]

Hi!

Liliana Marie Prikler <liliana.prikler@gmail.com> skribis:

> The current version appears to assume special values in the first and second
> package, but it's either all lists (default append) or all package input
> expressions (inside modify-inputs), which themselves are either packages
> or a list consisting of a package and a string.
>
> * .dir-locals.el: Drop (eval . (put 'prepend 'scheme-indent-function 2))
> and (eval . (put 'append 'scheme-indent-function 2)).

Yeah it’s been bothering me too.  :-)

We can keep ‘prepend’ though as it doesn’t clash with anything.

Otherwise LGTM,
Ludo’.

[bug#53505] [PATCH] .dir-locals.el: Don't mess up indentation of prepend and append.

[Liliana Marie Prikler]

Hi!

Am Mittwoch, dem 26.01.2022 um 12:24 +0100 schrieb Ludovic Courtès:
> Hi!
> 
> Liliana Marie Prikler <liliana.prikler@gmail.com> skribis:
> 
> > The current version appears to assume special values in the first
> > and second package, but it's either all lists (default append) or
> > all package input expressions (inside modify-inputs), which
> > themselves are either packages or a list consisting of a package
> > and a string.
> > 
> > * .dir-locals.el: Drop (eval . (put 'prepend 'scheme-indent-
> > function 2))
> > and (eval . (put 'append 'scheme-indent-function 2)).
> 
> Yeah it’s been bothering me too.  :-)
> 
> We can keep ‘prepend’ though as it doesn’t clash with anything.
It might not clash, but is its behaviour correct?  IIRC, prepend and
append take a list of packages inside modify-inputs, so if I wanted to
add spam, ham, eggs, milk and butter to a python-package, I'd write
that as

(modify-inputs my-package
  (prepend python-spam
       python-ham
     python-eggs
     python-milk
     python-butter))

That doesn't seem right, now does it?

[bug#53505] [PATCH] .dir-locals.el: Don't mess up indentation of prepend and append.

[Tobias Geerinckx-Rice via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 327 bytes --]

Lily, Ludo',

In fact the indentation rule for ‘prepend’ convinced me that I was 
holding it wrong the first time I tried it.  Perhaps I was missing 
a LIST call?  I had to convince myself I really wasn't.

What's the case in which the indent-by-2 rule is correct?  Trying 
to learn here.

Kind regards,

T G-R

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]

[bug#53505] [PATCH] .dir-locals.el: Don't mess up indentation of prepend and append.

[Ludovic Courtès]

Hallo!

Liliana Marie Prikler <liliana.prikler@gmail.com> skribis:

> Am Mittwoch, dem 26.01.2022 um 12:24 +0100 schrieb Ludovic Courtès:
>> Hi!
>> 
>> Liliana Marie Prikler <liliana.prikler@gmail.com> skribis:
>> 
>> > The current version appears to assume special values in the first
>> > and second package, but it's either all lists (default append) or
>> > all package input expressions (inside modify-inputs), which
>> > themselves are either packages or a list consisting of a package
>> > and a string.
>> > 
>> > * .dir-locals.el: Drop (eval . (put 'prepend 'scheme-indent-
>> > function 2))
>> > and (eval . (put 'append 'scheme-indent-function 2)).
>> 
>> Yeah it’s been bothering me too.  :-)
>> 
>> We can keep ‘prepend’ though as it doesn’t clash with anything.
> It might not clash, but is its behaviour correct?  IIRC, prepend and
> append take a list of packages inside modify-inputs, so if I wanted to
> add spam, ham, eggs, milk and butter to a python-package, I'd write
> that as
>
> (modify-inputs my-package
>   (prepend python-spam
>        python-ham
>      python-eggs
>      python-milk
>      python-butter))
>
> That doesn't seem right, now does it?

That looks wrong indeed.  Actually these two rules make no sense, right?
I don’t know what I was thinking about.

So I guess you can drop them, sorry for the noise!

Ludo’.

bug#53505: [PATCH] .dir-locals.el: Don't mess up indentation of prepend and append.

[Liliana Marie Prikler]

Hi

Am Samstag, dem 29.01.2022 um 00:03 +0100 schrieb Ludovic Courtès:
> Hallo!
> 
> Liliana Marie Prikler <liliana.prikler@gmail.com> skribis:
> > It might not clash, but is its behaviour correct?  [...]
> 
> That looks wrong indeed.  Actually these two rules make no sense,
> right?  I don’t know what I was thinking about.
> 
> So I guess you can drop them, sorry for the noise!
Don't worry and thanks for confirming.  I've pushed this now.

Cheers