From: João Távora <joaotavora@gmail.com>
Date: Sat, 18 Apr 2020 11:58:58 +0000 (+0100)
Subject: * lisp/files.el (auto-mode-alist): Handle .dir-locals-2.el.
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=18d9c0fa6846fb94323bf1ed3806a7864369ffd9;p=emacs.git

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

diff --git a/lisp/files.el b/lisp/files.el
index a769d061f94..f2f3eee965e 100644
--- 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)