; Merge from origin/emacs-25
The following commit was skipped:
71b20b3 Backport: * lisp/files.el: Remove support for extra .dir-locals file
This commit is contained in:
The following commit was skipped:
71b20b3 Backport: * lisp/files.el: Remove support for extra .dir-locals file