Skip to content

Commit da1c11c

Browse files
committed
patch 8.1.0507: .raml files not properly detected
Problem: .raml files not properly detected. Solution: Recognize .raml as raml instead of yaml. (closes #3594)
1 parent 9691f82 commit da1c11c

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

runtime/filetype.vim

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,7 +1129,7 @@ au BufNewFile,BufRead *.dpr setf pascal
11291129
" PDF
11301130
au BufNewFile,BufRead *.pdf setf pdf
11311131

1132-
" PCMK - HAE - crm configure edit
1132+
" PCMK - HAE - crm configure edit
11331133
au BufNewFile,BufRead *.pcmk setf pcmk
11341134

11351135
" Perl
@@ -1893,8 +1893,11 @@ au BufNewFile,BufRead *.yy,*.yxx,*.y++ setf yacc
18931893
" Yacc or racc
18941894
au BufNewFile,BufRead *.y call dist#ft#FTy()
18951895

1896-
" Yaml or Raml
1897-
au BufNewFile,BufRead *.yaml,*.yml,*.raml setf yaml
1896+
" Yaml
1897+
au BufNewFile,BufRead *.yaml,*.yml setf yaml
1898+
1899+
" Raml
1900+
au BufNewFile,BufRead *.raml setf raml
18981901

18991902
" yum conf (close enough to dosini)
19001903
au BufNewFile,BufRead */etc/yum.conf setf dosini
@@ -2107,7 +2110,7 @@ au BufNewFile,BufRead zsh*,zlog* call s:StarSetf('zsh')
21072110
au BufNewFile,BufRead *.text,README setf text
21082111

21092112
" Help files match *.txt but should have a last line that is a modeline.
2110-
au BufNewFile,BufRead *.txt
2113+
au BufNewFile,BufRead *.txt
21112114
\ if getline('$') !~ 'vim:.*ft=help'
21122115
\| setf text
21132116
\| endif

src/testdir/test_filetype.vim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,7 @@ let s:filename_checks = {
495495
\ 'xslt': ['file.xsl', 'file.xslt'],
496496
\ 'yacc': ['file.yy', 'file.yxx', 'file.y++'],
497497
\ 'yaml': ['file.yaml', 'file.yml'],
498+
\ 'raml': ['file.raml'],
498499
\ 'z8a': ['file.z8a'],
499500
\ 'zimbu': ['file.zu'],
500501
\ 'zimbutempl': ['file.zut'],

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -792,6 +792,8 @@ static char *(features[]) =
792792

793793
static int included_patches[] =
794794
{ /* Add new patch number below this line */
795+
/**/
796+
507,
795797
/**/
796798
506,
797799
/**/

0 commit comments

Comments
 (0)