diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-11-29 17:12:56 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-11-29 17:12:56 -0800 |
| commit | f069ea4f84a94bfbbd444073729f81fdd27c9445 (patch) | |
| tree | 6adf14a7d71264bb20c87a426df6e18e0edba9a3 /etc/NEWS.26 | |
| parent | 03e1012be4028e653bd88c93846b17172b5c0faa (diff) | |
| parent | 408862f02a874dcd9cfc2599adb35dec522b3ef4 (diff) | |
| download | emacs-f069ea4f84a94bfbbd444073729f81fdd27c9445.tar.gz | |
Merge from origin/emacs-26
408862f02a (origin/emacs-26) ; * lisp/emacs-lisp/bytecomp.el: Tweak m...
9964db4c34 Restore obsolete method of changing byte-compile-dest-file
3dd25aeecb Some minor Tramp corrections
d670a15f25 * doc/misc/url.texi (http/https): Fix typo
99d07e8d5e Remove some bogus definition-prefixes from loaddefs
6067f0c702 Shell-quote wildcards when invoking 'vc-git-grep'
0540df10e6 Update documentation of '.dir-locals-2.el'
f2441ab320 ; Fix some tiny doc and comment typos
22ff46e6d8 ; Fix some comment typos
# Conflicts:
# etc/NEWS
Diffstat (limited to 'etc/NEWS.26')
| -rw-r--r-- | etc/NEWS.26 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/NEWS.26 b/etc/NEWS.26 index f7a9feb6e49..4ccf468693c 100644 --- a/etc/NEWS.26 +++ b/etc/NEWS.26 @@ -366,7 +366,7 @@ These local variables will thus not vanish on setting a major mode. +++ ** A second dir-local file (.dir-locals-2.el) is now accepted. -See the variable 'dir-locals-file-2' for more information. +See the doc string of 'dir-locals-file' for more information. +++ ** Connection-local variables can be used to specify local variables |