summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu, Zhenyu <wuzhenyu@ustc.edu>2024-03-31 19:48:35 +0200
committerChristian Brabandt <cb@256bit.org>2024-03-31 19:48:35 +0200
commit3f6fa93b3b7d8e0bd30eddbbf4ae273c14d4455b (patch)
tree90b2751a841e54dfe0562b61e36fa29d2409b7c1
parenta2c27b01dc344b16849721bd934779c627665364 (diff)
patch 9.1.0247: filetype: bundle config files are not recognizedv9.1.0247
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>
-rw-r--r--runtime/filetype.vim3
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index bb5205f519..a289c85887 100644
--- 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 631792c617..aba03e4b7f 100644
--- 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 3b338937c6..47d8e14970 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 247,
+/**/
246,
/**/
245,