patch 9.1.1359: filetype: GNU Radio config files are not recognized
Problem: filetype: GNU Radio config files are not recognized.
Solution: detect GNU Radio config files as confini filetype. Only
allow '#' as start of comment in confini syntax (zeertzjq).
Ref:
- https://wiki.gnuradio.org/index.php/Configuration_Files
closes: #17242
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 87eac41..209f0dc 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
" Vim support file to detect file types
"
" Maintainer: The Vim Project <https://github.com/vim/vim>
-" Last Change: 2025 Apr 24
+" Last Change: 2025 May 02
" Former Maintainer: Bram Moolenaar <Bram@vim.org>
" Listen very carefully, I will say this only once
@@ -1811,6 +1811,8 @@
au BufNewFile,BufRead */.aws/config,*/.aws/credentials setf confini
au BufNewFile,BufRead *.nmconnection setf confini
au BufNewFile,BufRead paru.conf setf confini
+au BufNewFile,BufRead */{,.}gnuradio/*.conf setf confini
+au BufNewFile,BufRead */gnuradio/conf.d/*.conf setf confini
" Pacman hooks
au BufNewFile,BufRead *.hook
diff --git a/runtime/syntax/cfg.vim b/runtime/syntax/cfg.vim
index 4b5ebf5..6978876 100644
--- a/runtime/syntax/cfg.vim
+++ b/runtime/syntax/cfg.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: Good old CFG files
" Maintainer: Igor N. Prischepoff (igor@tyumbit.ru, pri_igor@mail.ru)
-" Last change: 2012 Aug 11
+" Last Change: 2012 Aug 11
" 2024 Nov 14 by Vim project: // only denotes a comment when starting a line (#16051)
" quit when a syntax file was already loaded
diff --git a/runtime/syntax/confini.vim b/runtime/syntax/confini.vim
index 823d417..009a60c 100644
--- a/runtime/syntax/confini.vim
+++ b/runtime/syntax/confini.vim
@@ -1,5 +1,7 @@
" Vim syntax file
" Language: confini
+" Last Change:
+" 2025 May 02 by Vim project commented line starts with # only
" Quit if a syntax file was already loaded
if exists("b:current_syntax")
@@ -9,4 +11,8 @@
" Use the cfg syntax for now, it's similar.
runtime! syntax/cfg.vim
+" Only accept '#' as the start of a comment.
+syn clear CfgComment
+syn match CfgComment "#.*" contains=@Spell
+
let b:current_syntax = 'confini'
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 260c3ee..bfafdbb 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -183,7 +183,8 @@
conaryrecipe: ['file.recipe'],
conf: ['auto.master', 'file.conf', 'texdoc.cnf', '.x11vncrc', '.chktexrc', '.ripgreprc', 'ripgreprc', 'file.ctags'],
config: ['configure.in', 'configure.ac', '/etc/hostname.file', 'any/etc/hostname.file'],
- confini: ['pacman.conf', 'paru.conf', 'mpv.conf', 'any/.aws/config', 'any/.aws/credentials', 'file.nmconnection'],
+ confini: ['pacman.conf', 'paru.conf', 'mpv.conf', 'any/.aws/config', 'any/.aws/credentials', 'file.nmconnection',
+ 'any/.gnuradio/grc.conf', 'any/gnuradio/config.conf', 'any/gnuradio/conf.d/modtool.conf'],
context: ['tex/context/any/file.tex', 'file.mkii', 'file.mkiv', 'file.mkvi', 'file.mkxl', 'file.mklx'],
cook: ['file.cook'],
corn: ['file.corn'],
diff --git a/src/version.c b/src/version.c
index 8173988..d64a1e6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1359,
+/**/
1358,
/**/
1357,