diff options
| author | Artur Malabarba | 2016-01-25 22:42:50 +0000 |
|---|---|---|
| committer | Artur Malabarba | 2016-01-25 23:42:41 +0000 |
| commit | da976cff352bdea6adc2667582a56eb4061bb5f6 (patch) | |
| tree | 73b89ceb316306267ca9816dd8d30a0445382fb9 /etc | |
| parent | 914fb99d38f8a9db7fbf926d0cf34b808d581afe (diff) | |
| download | emacs-da976cff352bdea6adc2667582a56eb4061bb5f6.tar.gz emacs-da976cff352bdea6adc2667582a56eb4061bb5f6.zip | |
* lisp/files.el: Use a fixed file name for the second dir-locals file
(dir-locals-file): Revert to its original fixed value.
(dir-locals-file-2): New const.
(dir-locals--all-files): Don't use `file-name-all-completions'.
Instead, just check for the 2 dir-locals files and return a list
of the ones that exit (if any).
* etc/NEWS: Document the change.
* doc/emacs/custom.texi (Directory Variables): Document the change.
* doc/lispref/variables.texi (Directory Local Variables): Update
accordingly.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/NEWS | 5 |
1 files changed, 2 insertions, 3 deletions
| @@ -179,9 +179,8 @@ by default, and must be enabled by using the `--with-modules' option | |||
| 179 | at configure time. | 179 | at configure time. |
| 180 | 180 | ||
| 181 | +++ | 181 | +++ |
| 182 | ** Any file of the form .dir-locals*.el is now considered a dir-local | 182 | ** A second dir-local file (.dir-locals-2.el) is now accepted. |
| 183 | file, and multiple such files can be used in the same directory. See | 183 | See the variable `dir-locals-file-2' for more information. |
| 184 | the variable `dir-locals-file' for more information. | ||
| 185 | 184 | ||
| 186 | +++ | 185 | +++ |
| 187 | ** Network security (TLS/SSL certificate validity and the like) is | 186 | ** Network security (TLS/SSL certificate validity and the like) is |