[PATCH] project.el: Use list of strings p for safe local variable

[PATCH] project.el: Use list of strings p for safe local variable

[Joseph Turner]

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

Might make sense to merge this into 29.2?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-project.el-Use-list-of-strings-p-for-safe-local-vari.patch --]
[-- Type: text/x-diff, Size: 1587 bytes --]

From 8237eb21c81b3e5ededd42a3a2d5b9770d45ca92 Mon Sep 17 00:00:00 2001
From: Joseph Turner <joseph@breatheoutbreathe.in>
Date: Fri, 25 Aug 2023 21:31:06 -0700
Subject: [PATCH] project.el: Use list-of-strings-p for safe-local-variable
 predicate

* lisp/progmodes/project.el (project-vc-ignores)
(project-vc-extra-root-markers)
---
 lisp/progmodes/project.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 8d8bf594628..882173a65d0 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -397,7 +397,7 @@ the buffer's value of `default-directory'."
 (defcustom project-vc-ignores nil
   "List of patterns to add to `project-ignores'."
   :type '(repeat string))
-;;;###autoload(put 'project-vc-ignores 'safe-local-variable #'listp)
+;;;###autoload(put 'project-vc-ignores 'safe-local-variable #'list-of-strings-p)
 
 (defcustom project-vc-merge-submodules t
   "Non-nil to consider submodules part of the parent project.
@@ -452,7 +452,7 @@ variables, such as `project-vc-ignores' or `project-vc-name'."
   :type '(repeat string)
   :version "29.1"
   :package-version '(project . "0.9.0"))
-;;;###autoload(put 'project-vc-extra-root-markers 'safe-local-variable (lambda (val) (and (listp val) (not (memq nil (mapcar #'stringp val))))))
+;;;###autoload(put 'project-vc-extra-root-markers 'safe-local-variable #'list-of-strings-p)
 
 ;; FIXME: Using the current approach, major modes are supposed to set
 ;; this variable to a buffer-local value.  So we don't have access to
-- 
2.41.0

Re: [PATCH] project.el: Use list of strings p for safe local variable

[Stefan Kangas]

Thanks for the patch.  I recommend re-sending it to
bug-gnu-emacs@gnu.org so that we don't lose track of it.

Re: [PATCH] project.el: Use list of strings p for safe local variable

[Dmitry Gutov]

On 26/08/2023 07:38, Joseph Turner wrote:
> Might make sense to merge this into 29.2?

Thank you, but the function list-of-strings-p has only been added very 
recently.

project.el is a "core ELPA package", meaning we publish every 
version-tagged release to ELPA as well, maintaining compatibility with 
Emacs 26.1+. So this won't fly just yet.

Maybe in 4-5 years or so.

bug#65608: Fwd: [PATCH] project.el: Use list of strings p for safe local variable

[Joseph Turner via Bug reports for GNU Emacs, the Swiss army knife of text editors]

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

Stefan Kangas suggested I resend this patch to this mailing list so that
it's not lost even though it can't be applied yet.

Joseph Turner <joseph@breatheoutbreathe.in> writes:

> Might make sense to merge this into 29.2?
>
> [2. text/x-diff; 0001-project.el-Use-list-of-strings-p-for-safe-local-vari.patch]...


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-project.el-Use-list-of-strings-p-for-safe-local-vari.patch --]
[-- Type: text/x-diff, Size: 1587 bytes --]

From 8237eb21c81b3e5ededd42a3a2d5b9770d45ca92 Mon Sep 17 00:00:00 2001
From: Joseph Turner <joseph@breatheoutbreathe.in>
Date: Fri, 25 Aug 2023 21:31:06 -0700
Subject: [PATCH] project.el: Use list-of-strings-p for safe-local-variable
 predicate

* lisp/progmodes/project.el (project-vc-ignores)
(project-vc-extra-root-markers)
---
 lisp/progmodes/project.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 8d8bf594628..882173a65d0 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -397,7 +397,7 @@ the buffer's value of `default-directory'."
 (defcustom project-vc-ignores nil
   "List of patterns to add to `project-ignores'."
   :type '(repeat string))
-;;;###autoload(put 'project-vc-ignores 'safe-local-variable #'listp)
+;;;###autoload(put 'project-vc-ignores 'safe-local-variable #'list-of-strings-p)
 
 (defcustom project-vc-merge-submodules t
   "Non-nil to consider submodules part of the parent project.
@@ -452,7 +452,7 @@ variables, such as `project-vc-ignores' or `project-vc-name'."
   :type '(repeat string)
   :version "29.1"
   :package-version '(project . "0.9.0"))
-;;;###autoload(put 'project-vc-extra-root-markers 'safe-local-variable (lambda (val) (and (listp val) (not (memq nil (mapcar #'stringp val))))))
+;;;###autoload(put 'project-vc-extra-root-markers 'safe-local-variable #'list-of-strings-p)
 
 ;; FIXME: Using the current approach, major modes are supposed to set
 ;; this variable to a buffer-local value.  So we don't have access to
-- 
2.41.0

bug#65608: Fwd: [PATCH] project.el: Use list of strings p for safe local variable

[Dmitry Gutov]

On 30/08/2023 10:10, Joseph Turner via Bug reports for GNU Emacs, the 
Swiss army knife of text editors wrote:
> Stefan Kangas suggested I resend this patch to this mailing list so that
> it's not lost even though it can't be applied yet.

Just to clarify for posterity: it can't be applied yet because 
list-of-string-p is not in Emacs 26. Or 27 (which we might bump the 
requirement to in not-too-distant future).

bug#65608: Fwd: [PATCH] project.el: Use list of strings p for safe local variable

[Stefan Kangas]

Version: 30.1

Dmitry Gutov <dmitry@gutov.dev> writes:

> On 30/08/2023 10:10, Joseph Turner via Bug reports for GNU Emacs, the
> Swiss army knife of text editors wrote:
> > Stefan Kangas suggested I resend this patch to this mailing list so that
> > it's not lost even though it can't be applied yet.
>
> Just to clarify for posterity: it can't be applied yet because
> list-of-string-p is not in Emacs 26. Or 27 (which we might bump the
> requirement to in not-too-distant future).

Right.  Note that `list-of-strings-p' was added in Emacs 28, though.
So I added a comment to that effect in commit 9647ddb2993, and I'm
closing the bug.

bug#65608: Fwd: [PATCH] project.el: Use list of strings p for safe local variable

[Dmitry Gutov]

On 30/08/2023 20:54, Stefan Kangas wrote:
> Right.  Note that `list-of-strings-p' was added in Emacs 28, though.

I think you meant to say Emacs 29 here.

> So I added a comment to that effect in commit 9647ddb2993, and I'm
> closing the bug.

Thank you.

bug#65608: Fwd: [PATCH] project.el: Use list of strings p for safe local variable

[Stefan Kangas]

Dmitry Gutov <dmitry@gutov.dev> writes:

> On 30/08/2023 20:54, Stefan Kangas wrote:
> > Right.  Note that `list-of-strings-p' was added in Emacs 28, though.
>
> I think you meant to say Emacs 29 here.

Yes, indeed.