diff options
| author | Lars Ingebrigtsen | 2021-01-23 23:12:05 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2021-01-23 23:12:05 +0100 |
| commit | 75f6b264f549ee66faae75bfbad4d3f7602e2a64 (patch) | |
| tree | 4802f098d5b79352bbd3a056d914da0555b144eb | |
| parent | 1559cc445a306b61b2a47c710e049ea26fe5265d (diff) | |
| download | emacs-75f6b264f549ee66faae75bfbad4d3f7602e2a64.tar.gz emacs-75f6b264f549ee66faae75bfbad4d3f7602e2a64.zip | |
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.
| -rw-r--r-- | lisp/files.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/files.el b/lisp/files.el index d2e5413b3ad..7af5549bcb0 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -4062,7 +4062,7 @@ Return the new variables list." | |||
| 4062 | (subdirs (assq 'subdirs alist))) | 4062 | (subdirs (assq 'subdirs alist))) |
| 4063 | (if (or (not subdirs) | 4063 | (if (or (not subdirs) |
| 4064 | (progn | 4064 | (progn |
| 4065 | (setq alist (delq subdirs alist)) | 4065 | (setq alist (remq subdirs alist)) |
| 4066 | (cdr-safe subdirs)) | 4066 | (cdr-safe subdirs)) |
| 4067 | ;; TODO someone might want to extend this to allow | 4067 | ;; TODO someone might want to extend this to allow |
| 4068 | ;; integer values for subdir, where N means | 4068 | ;; integer values for subdir, where N means |