* lisp/files.el (auto-mode-alist): Handle .dir-locals-2.el.

diff --git a/lisp/files.el b/lisp/files.el
index a769d061f94abb1d2993b9a9e2edbd477573afad..f2f3eee965eb78284fa58df4a5bd1b028a720232 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2659,7 +2659,7 @@ since only a single case-insensitive search through the alist is made."
      ("\\.org\\'" . org-mode)
      ;; .dir-locals.el is not really elisp.  Can't use the
      ;; `dir-locals-file' constant since that is defined below.
-     (".dir-locals.el" . lisp-data-mode)
+     (".dir-locals\\(-2\\)?.el" . lisp-data-mode)
      ("\\.el\\'" . emacs-lisp-mode)
      ("Project\\.ede\\'" . emacs-lisp-mode)
      ("\\.\\(scm\\|stk\\|ss\\|sch\\)\\'" . scheme-mode)