aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorKaushal Modi2017-11-28 19:17:48 +0200
committerEli Zaretskii2017-11-28 19:17:48 +0200
commit0540df10e63ba624a775cfe1bba4124456591cf5 (patch)
tree9a016173e21ae7ed1100ee260cffe3e4814b96e7 /etc
parentf2441ab3204274cba16f5cab19e98db61d468fb7 (diff)
downloademacs-0540df10e63ba624a775cfe1bba4124456591cf5.tar.gz
emacs-0540df10e63ba624a775cfe1bba4124456591cf5.zip
Update documentation of '.dir-locals-2.el'
See https://lists.gnu.org/r/emacs-devel/2017-11/msg00649.html for more details. * lisp/files.el (dir-locals-file-2): Remove unused constant. * lisp/files.el (dir-locals-file): Mention ".dir-locals-2.el" in the doc string. * doc/lispref/variables.texi (Directory Local Variables): Mention ".dir-locals-2.el". * etc/NEWS: Replace `dir-locals-file-2' mention with `dir-locals-file'.
Diffstat (limited to 'etc')
-rw-r--r--etc/NEWS2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/NEWS b/etc/NEWS
index f7a9feb6e49..4ccf468693c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -366,7 +366,7 @@ These local variables will thus not vanish on setting a major mode.
366 366
367+++ 367+++
368** A second dir-local file (.dir-locals-2.el) is now accepted. 368** A second dir-local file (.dir-locals-2.el) is now accepted.
369See the variable 'dir-locals-file-2' for more information. 369See the doc string of 'dir-locals-file' for more information.
370 370
371+++ 371+++
372** Connection-local variables can be used to specify local variables 372** Connection-local variables can be used to specify local variables