[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#58506: Use ".dir-locals.eld" and ".dir-locals-2.eld" when they exist
From: |
Eli Zaretskii |
Subject: |
bug#58506: Use ".dir-locals.eld" and ".dir-locals-2.eld" when they exist |
Date: |
Fri, 14 Oct 2022 13:38:27 +0300 |
> Cc: Juri Linkov <juri@linkov.net>, Philip Kaludercic <philipk@posteo.net>,
> Stefan Monnier <monnier@iro.umontreal.ca>
> From: Stefan Kangas <stefankangas@gmail.com>
> Date: Fri, 14 Oct 2022 11:22:23 +0200
>
> Severity: wishlist
>
> [Spun out from Bug#58486.]
>
> Juri Linkov <juri@linkov.net> writes:
>
> > It's already handled by auto-mode-alist:
> >
> > (defvar auto-mode-alist
> > ...
> > ;; .dir-locals.el is not really Elisp. Could use the
> > ;; `dir-locals-file' constant if it weren't defined below.
> > ("\\.dir-locals\\(?:-2\\)?\\.el\\'" . lisp-data-mode)
>
> It's nice if we can use the "*.eld" extension for files that are not
> supposed to be executed. But it's hard to just change that outright, as
> a file ".dir-locals.eld" won't be used on old versions of Emacs.
>
> So how about doing something like the below, as a future compatibility
> patch? Then, in some undefined future version, we can consider creating
> ".dir-locals.eld" files by default, instead.
>
> diff --git a/lisp/files.el b/lisp/files.el
> index 94d110f0b7..bfd1e5e8e1 100644
> --- a/lisp/files.el
> +++ b/lisp/files.el
> @@ -4403,11 +4403,14 @@ dir-locals--all-files
> (dosified-file-name dir-locals-file)
> dir-locals-file)
> directory))
> - (file-2 (when (string-match "\\.el\\'" file-1)
> + (is-el (string-match (rx ".el" eos) file-1))
> + (file-2 (when is-el
> (replace-match "-2.el" t nil file-1)))
> (out nil))
> ;; The order here is important.
> - (dolist (f (list file-2 file-1))
> + ;; Support *.eld files, too.
> + (dolist (f (list (and is-el (concat file-2 "d")) file-2
> + (and is-el (concat file-1 "d")) file-1))
This conses 2 strings, which is a pity, because this code is called a
lot. Can this be done without so much consing for such a simple job?
- bug#58486: [PATCH] Prevent .dir-locals.el from being byte-compiled, Philip Kaludercic, 2022/10/13
- bug#58486: [PATCH] Prevent .dir-locals.el from being byte-compiled, Stefan Kangas, 2022/10/13
- bug#58486: [PATCH] Prevent .dir-locals.el from being byte-compiled, Philip Kaludercic, 2022/10/13
- bug#58486: [PATCH] Prevent .dir-locals.el from being byte-compiled, Juri Linkov, 2022/10/13
- bug#58506: Use ".dir-locals.eld" and ".dir-locals-2.eld" when they exist, Lars Ingebrigtsen, 2022/10/14
- bug#58506: Use ".dir-locals.eld" and ".dir-locals-2.eld" when they exist, Stefan Kangas, 2022/10/14
- bug#58506: Use ".dir-locals.eld" and ".dir-locals-2.eld" when they exist, Robert Pluim, 2022/10/14
- bug#58506: Use ".dir-locals.eld" and ".dir-locals-2.eld" when they exist, Lars Ingebrigtsen, 2022/10/14
- bug#58506: Use ".dir-locals.eld" and ".dir-locals-2.eld" when they exist, Robert Pluim, 2022/10/14
- bug#58506: Use ".dir-locals.eld" and ".dir-locals-2.eld" when they exist, Lars Ingebrigtsen, 2022/10/14
- bug#58506: Use ".dir-locals.eld" and ".dir-locals-2.eld" when they exist, Robert Pluim, 2022/10/14
- bug#58506: Use ".dir-locals.eld" and ".dir-locals-2.eld" when they exist, Philip Kaludercic, 2022/10/14
- bug#58506: Use ".dir-locals.eld" and ".dir-locals-2.eld" when they exist, Lars Ingebrigtsen, 2022/10/15