patch 9.1.0247: filetype: bundle config files are not recognized

Problem:  filetype: bundle config files are not recognized
Solution: Detect '*/.bundle/config' as yaml
          (Wu, Zhenyu)

closes: #14368

Signed-off-by: Wu, Zhenyu <wuzhenyu@ustc.edu>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index bb5205f519a31b5648ae830316330eff0af820a1..a289c85887c4f316fba1216f4851f0190d6bd55e 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -280,6 +280,9 @@ endif
 " Busted (Lua unit testing framework - configuration files)
 au BufNewFile,BufRead .busted                  setf lua
 
+" Bundle config
+au BufNewFile,BufRead */.bundle/config                 setf yaml
+
 " C or lpc
 au BufNewFile,BufRead *.c                      call dist#ft#FTlpc()
 au BufNewFile,BufRead *.lpc,*.ulpc             setf lpc

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 631792c617f2172fd21fa3a86a3cba23306a29c2..aba03e4b7f330c70d24f08d9bc1b251df97731e0 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -820,7 +820,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     xsd: ['file.xsd'],
     xslt: ['file.xsl', 'file.xslt'],
     yacc: ['file.yy', 'file.yxx', 'file.y++'],
-    yaml: ['file.yaml', 'file.yml', 'file.eyaml', '.clangd', '.clang-format', '.clang-tidy', 'file.mplstyle'],
+    yaml: ['file.yaml', 'file.yml', 'file.eyaml', 'any/.bundle/config', '.clangd', '.clang-format', '.clang-tidy', 'file.mplstyle'],
     yang: ['file.yang'],
     yuck: ['file.yuck'],
     z8a: ['file.z8a'],

diff --git a/src/version.c b/src/version.c
index 3b338937c6ea4b9a81e937363f9d36b3fcc50456..47d8e14970e97d2fdc5d8e6c869f62ee57b3c5c3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    247,
 /**/
     246,
 /**/