summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-05-30 13:15:14 +0200
committerBram Moolenaar <Bram@vim.org>2020-05-30 13:15:14 +0200
commit0016fd2e29b7d4d4eef89a0516d14888a8651c61 (patch)
tree92e827e66543b983009c5b1eac090590e79dbb8a
parent208534d9ae6e8dec5baff90440b58c63f0b37981 (diff)
patch 8.2.0843: filetype elm not detectedv8.2.0843
Problem: Filetype elm not detected. Solution: Recognize *.elm files. (closes #6157)
-rw-r--r--runtime/filetype.vim3
-rw-r--r--src/testdir/test_filetype.vim1
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 7157f092b6..e12c8ee770 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -547,6 +547,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/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index c881fdedce..c47a6b822d 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/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'],
diff --git a/src/version.c b/src/version.c
index 641b3757f8..349ecbef62 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 843,
+/**/
842,
/**/
841,