aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2018-11-04 05:56:34 -0500
committerJustin M. Keyes <justinkz@gmail.com>2018-11-04 11:56:34 +0100
commit21fb9b2b085eca6d29d7d6b338ee11701b927df3 (patch)
treedff660e00878f8d7f2dfcd9ba7e86f5992338861
parent67f80d485cecc1158d9d3833cbf1cf67f3a324bb (diff)
downloadrneovim-21fb9b2b085eca6d29d7d6b338ee11701b927df3.tar.gz
rneovim-21fb9b2b085eca6d29d7d6b338ee11701b927df3.tar.bz2
rneovim-21fb9b2b085eca6d29d7d6b338ee11701b927df3.zip
vim-patch:8.1.0507: .raml files not properly detected (#9195)
Problem: .raml files not properly detected. Solution: Recognize .raml as raml instead of yaml. (closes vim/vim#3594) https://github.com/vim/vim/commit/da1c11c6411182e9a4bd4374e3fb8851fef77113
-rw-r--r--runtime/filetype.vim9
-rw-r--r--src/nvim/testdir/test_filetype.vim1
2 files changed, 7 insertions, 3 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 6fdc02aaf0..a4d46fd842 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1125,7 +1125,7 @@ au BufNewFile,BufRead *.dpr setf pascal
" PDF
au BufNewFile,BufRead *.pdf setf pdf
-" PCMK - HAE - crm configure edit
+" PCMK - HAE - crm configure edit
au BufNewFile,BufRead *.pcmk setf pcmk
" Perl
@@ -1892,8 +1892,11 @@ au BufNewFile,BufRead *.yy,*.yxx,*.y++ setf yacc
" Yacc or racc
au BufNewFile,BufRead *.y call dist#ft#FTy()
-" Yaml or Raml
-au BufNewFile,BufRead *.yaml,*.yml,*.raml setf yaml
+" Yaml
+au BufNewFile,BufRead *.yaml,*.yml setf yaml
+
+" Raml
+au BufNewFile,BufRead *.raml setf raml
" yum conf (close enough to dosini)
au BufNewFile,BufRead */etc/yum.conf setf dosini
diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim
index 4403d89121..b0a1ea0225 100644
--- a/src/nvim/testdir/test_filetype.vim
+++ b/src/nvim/testdir/test_filetype.vim
@@ -494,6 +494,7 @@ let s:filename_checks = {
\ 'xslt': ['file.xsl', 'file.xslt'],
\ 'yacc': ['file.yy', 'file.yxx', 'file.y++'],
\ 'yaml': ['file.yaml', 'file.yml'],
+ \ 'raml': ['file.raml'],
\ 'z8a': ['file.z8a'],
\ 'zimbu': ['file.zu'],
\ 'zimbutempl': ['file.zut'],