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)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index af27c85d888b46261b282af672d5ba29dac55740..72a756d84ba782046ce10b373758b1363303bda2 100644 (file)
--- 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 9c537646f55417ea2ff83c6e908862a80b7ad8e2..d146bd2ce19f44ee157a446f0bda8f454bfc0330 100644 (file)
--- 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 54b9a6c7b6e111287a6f00a9284e572f01f86aff..28f39d4b936b2299ade94d4f260d5ee935493473 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -792,6 +792,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    507,
 /**/
     506,
 /**/