aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-05-30 18:06:23 -0400
committerGitHub <noreply@github.com>2020-05-30 18:06:23 -0400
commit4b87248285e7d954e496f84a7ece58b4f1a830ca (patch)
treeeb667116d724d9cde00e39b5b4b17907c491c2bb
parentb8e2cd4f600ad15760524984aed666ec6e0457fd (diff)
downloadrneovim-4b87248285e7d954e496f84a7ece58b4f1a830ca.tar.gz
rneovim-4b87248285e7d954e496f84a7ece58b4f1a830ca.tar.bz2
rneovim-4b87248285e7d954e496f84a7ece58b4f1a830ca.zip
vim-patch:8.2.0843: filetype elm not detected (#12403)
Problem: Filetype elm not detected. Solution: Recognize *.elm files. (closes vim/vim#6157) https://github.com/vim/vim/commit/0016fd2e29b7d4d4eef89a0516d14888a8651c61
-rw-r--r--runtime/filetype.vim3
-rw-r--r--src/nvim/testdir/test_filetype.vim1
2 files changed, 4 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 0b5003dc44..b29168984c 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -543,6 +543,9 @@ au BufNewFile,BufRead */etc/elinks.conf,*/.elinks/elinks.conf setf elinks
" ERicsson LANGuage; Yaws is erlang too
au BufNewFile,BufRead *.erl,*.hrl,*.yaws setf erlang
+" Elm
+au BufNewFile,BufRead *.elm setf elm
+
" Elm Filter Rules file
au BufNewFile,BufRead filter-rules setf elmfilt
diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim
index ace56a375f..832f1726fb 100644
--- a/src/nvim/testdir/test_filetype.vim
+++ b/src/nvim/testdir/test_filetype.vim
@@ -151,6 +151,7 @@ let s:filename_checks = {
\ 'ecd': ['file.ecd'],
\ 'edif': ['file.edf', 'file.edif', 'file.edo'],
\ 'elinks': ['/etc/elinks.conf', '/.elinks/elinks.conf'],
+ \ 'elm': ['file.elm'],
\ 'elmfilt': ['filter-rules'],
\ 'erlang': ['file.erl', 'file.hrl', 'file.yaws'],
\ 'eruby': ['file.erb', 'file.rhtml'],