From 5f20f050efed3431beaf85739f0113e9ef0abd8e Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Wed, 14 Feb 2024 22:30:06 +0100 Subject: [PATCH] patch 9.1.0110: filetype: add 'Config.in' filetype detection The 'Config.in' file type is for Buildroot configuration files. Buildroot Config.in files use the same Kconfig backend as the Linux kernel's Kconfig files. Buildroot also has other filename variants that follow "Config.in.*", they are used to distinguish multiple Config.in files in the same directory. See https://buildroot.org/downloads/manual/manual.html#_literal_config_in_literal_file closes: #14038 Signed-off-by: Brandon Maier Signed-off-by: Christian Brabandt --- runtime/filetype.vim | 4 ++-- src/testdir/test_filetype.vim | 2 +- src/version.c | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 708ce5adfe32e..5ae632be9975a 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1141,7 +1141,7 @@ au BufNewFile,BufRead *.kt,*.ktm,*.kts setf kotlin au BufNewFile,BufRead *.ks setf kscript " Kconfig -au BufNewFile,BufRead Kconfig,Kconfig.debug setf kconfig +au BufNewFile,BufRead Kconfig,Kconfig.debug,Config.in setf kconfig " Lace (ISE) au BufNewFile,BufRead *.ace,*.ACE setf lace @@ -2780,7 +2780,7 @@ au! BufNewFile,BufRead *jarg* au BufNewFile,BufRead *.properties_??_??_* call s:StarSetf('jproperties') " Kconfig -au BufNewFile,BufRead Kconfig.* call s:StarSetf('kconfig') +au BufNewFile,BufRead Kconfig.*,Config.in.* call s:StarSetf('kconfig') " Lilo: Linux loader au BufNewFile,BufRead lilo.conf* call s:StarSetf('lilo') diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 05d4754e5bf23..f13c99dac2a06 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -357,7 +357,7 @@ def s:GetFilenameChecks(): dict> jsp: ['file.jsp'], julia: ['file.jl'], just: ['justfile', 'Justfile', '.justfile', 'config.just'], - kconfig: ['Kconfig', 'Kconfig.debug', 'Kconfig.file'], + kconfig: ['Kconfig', 'Kconfig.debug', 'Kconfig.file', 'Config.in', 'Config.in.host'], kdl: ['file.kdl'], kivy: ['file.kv'], kix: ['file.kix'], diff --git a/src/version.c b/src/version.c index c347e9de016fa..a8e7488ee98b1 100644 --- 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 */ +/**/ + 110, /**/ 109, /**/