diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-11-03 19:52:15 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-11-03 19:52:15 +0100 |
| commit | da1c11c6411182e9a4bd4374e3fb8851fef77113 (patch) | |
| tree | 5701e62b06c7649e3443947f9e46ca4860150298 | |
| parent | 9691f82f862ed18c2e3e48f9d2cd902bb947f803 (diff) | |
| download | vim-git-da1c11c6411182e9a4bd4374e3fb8851fef77113.tar.gz | |
patch 8.1.0507: .raml files not properly detectedv8.1.0507
Problem: .raml files not properly detected.
Solution: Recognize .raml as raml instead of yaml. (closes #3594)
| -rw-r--r-- | runtime/filetype.vim | 11 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index af27c85d8..72a756d84 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1129,7 +1129,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 @@ -1893,8 +1893,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 @@ -2107,7 +2110,7 @@ au BufNewFile,BufRead zsh*,zlog* call s:StarSetf('zsh') au BufNewFile,BufRead *.text,README setf text " Help files match *.txt but should have a last line that is a modeline. -au BufNewFile,BufRead *.txt +au BufNewFile,BufRead *.txt \ if getline('$') !~ 'vim:.*ft=help' \| setf text \| endif diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 9c537646f..d146bd2ce 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -495,6 +495,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'], diff --git a/src/version.c b/src/version.c index 54b9a6c7b..28f39d4b9 100644 --- a/src/version.c +++ b/src/version.c @@ -793,6 +793,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 507, +/**/ 506, /**/ 505, |