changeset 14991:ebabd6fe3833 v8.1.0507

patch 8.1.0507: .raml files not properly detected commit https://github.com/vim/vim/commit/da1c11c6411182e9a4bd4374e3fb8851fef77113 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Nov 3 19:52:15 2018 +0100 patch 8.1.0507: .raml files not properly detected Problem: .raml files not properly detected. Solution: Recognize .raml as raml instead of yaml. (closes https://github.com/vim/vim/issues/3594)
author Bram Moolenaar <Bram@vim.org>
date Sat, 03 Nov 2018 20:00:06 +0100
parents 651a9bce30ac
children 3916597e1b30
files runtime/filetype.vim src/testdir/test_filetype.vim src/version.c
diffstat 3 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1129,7 +1129,7 @@ au BufNewFile,BufRead *.dpr			setf pasca
 " 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++		
 " 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
 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
--- 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'],
--- 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,