diff options
| author | Artur Malabarba <bruce.connor.am@gmail.com> | 2016-01-30 16:14:52 +0000 |
|---|---|---|
| committer | Artur Malabarba <bruce.connor.am@gmail.com> | 2016-01-30 19:54:41 +0000 |
| commit | 71b20b31c8ee25bcd0de1a954c9ca7b49140b3b2 (patch) | |
| tree | 687f518360ec65ff3d03639a33589720913d729c /doc/emacs | |
| parent | ae26c8a7a46ffa6266a4efce592827cf47e85170 (diff) | |
Backport: * lisp/files.el: Remove support for extra .dir-locals file
(dir-locals-file-2, dir-locals--all-files): Remove.
(dir-locals-collect-variables, dir-locals-file, dir-locals-find-file)
(dir-locals-read-from-file, hack-dir-local-variables): Revert changes.
* lisp/files-x.el (modify-dir-local-variable): Revert changes.
* lisp/help-fns.el (describe-variable): Revert changes.
* doc/emacs/custom.texi (Directory Variables): Revert changes.
* etc/NEWS: Revert changes.
Diffstat (limited to 'doc/emacs')
| -rw-r--r-- | doc/emacs/custom.texi | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index 7be660c85d..c109335375 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -1298,11 +1298,7 @@ accomplished with @dfn{directory-local variables}. named @file{.dir-locals.el}@footnote{ On MS-DOS, the name of this file should be @file{_dir-locals.el}, due to limitations of the DOS filesystems. If the filesystem is limited to 8+3 file names, the name -of the file will be truncated by the OS to @file{_dir-loc.el}. -}@footnote{ You can also use @file{.dir-locals-2.el}, which -is loaded in addition. This is useful when @file{.dir-locals.el} is -under version control in a shared repository and can't be used for -personal customizations. } in a +of the file will be truncated by the OS to @file{_dir-loc.el}. } in a directory. Whenever Emacs visits any file in that directory or any of its subdirectories, it will apply the directory-local variables specified in @file{.dir-locals.el}, as though they had been defined as |