From ad5faa424a5d2f0d67265906d21f7af98220df26 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 23 Jul 2021 15:51:11 +0200 Subject: Add auto-mode-alist functionality to .dir-locals.el * doc/emacs/custom.texi (Directory Variables): Document auto-mode-alist in .dir-locals.el (Bug#18721) * doc/emacs/modes.texi (Choosing Modes): Update. * lisp/files.el (set-auto-mode--apply-alist): New function, from set-auto-mode. (set-auto-mode): Check directory locals for auto-mode-alist. (dir-locals-collect-variables): Add "predicate" parameter. (hack-dir-local--get-variables): New function, from hack-dir-local-variables. (hack-dir-local-variables): Call hack-dir-local--get-variables. * test/lisp/files-resources/.dir-locals.el: New file. * test/lisp/files-resources/whatever.quux: New file. * test/lisp/files-tests.el (files-tests-data-dir): New variable. (files-test-dir-locals-auto-mode-alist): New test. --- test/lisp/files-resources/.dir-locals.el | 2 ++ test/lisp/files-resources/whatever.quux | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 test/lisp/files-resources/.dir-locals.el create mode 100644 test/lisp/files-resources/whatever.quux (limited to 'test/lisp/files-resources') diff --git a/test/lisp/files-resources/.dir-locals.el b/test/lisp/files-resources/.dir-locals.el new file mode 100644 index 00000000000..84997b8a0c0 --- /dev/null +++ b/test/lisp/files-resources/.dir-locals.el @@ -0,0 +1,2 @@ +;; This is used by files-tests.el. +((auto-mode-alist . (("\\.quux\\'" . tcl-mode)))) diff --git a/test/lisp/files-resources/whatever.quux b/test/lisp/files-resources/whatever.quux new file mode 100644 index 00000000000..595583b911e --- /dev/null +++ b/test/lisp/files-resources/whatever.quux @@ -0,0 +1,2 @@ +# Used by files-test.el. +# Due to .dir-locals.el this should end up in Tcl mode. -- cgit v1.2.3