[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 75f6b26: Make (subdirs . nil) in .dir-locals.el work
From: |
Lars Ingebrigtsen |
Subject: |
master 75f6b26: Make (subdirs . nil) in .dir-locals.el work |
Date: |
Sat, 23 Jan 2021 17:12:13 -0500 (EST) |
branch: master
commit 75f6b264f549ee66faae75bfbad4d3f7602e2a64
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Make (subdirs . nil) in .dir-locals.el work
* lisp/files.el (dir-locals-collect-variables): Don't
destructively modify the cached structure (bug#17205), because
that means that (subdirs . nil) doesn't work.
---
lisp/files.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lisp/files.el b/lisp/files.el
index d2e5413..7af5549 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4062,7 +4062,7 @@ Return the new variables list."
(subdirs (assq 'subdirs alist)))
(if (or (not subdirs)
(progn
- (setq alist (delq subdirs alist))
+ (setq alist (remq subdirs alist))
(cdr-safe subdirs))
;; TODO someone might want to extend this to allow
;; integer values for subdir, where N means
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 75f6b26: Make (subdirs . nil) in .dir-locals.el work,
Lars Ingebrigtsen <=