patch 9.1.0304: filetype: cgdb config file is not recognized

Problem:  filetype: cgdb config file is not recognized
Solution: Detect cgdbrc files as cgdbrc filetype
          (Wu, Zhenyu)

closes: #14458

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 732362d2a3913bb7dd0aa7c4058fd92b346ef7b3..4f91959207c0d21ad4a985d49e79069b2c74915b 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -296,6 +296,9 @@ au BufNewFile,BufRead calendar                      setf calendar
 " Cap'n Proto
 au BufNewFile,BufRead *.capnp                  setf capnp
 
+" Cgdb config file
+au BufNewFile,BufRead cgdbrc                   setf cgdbrc
+
 " C#
 au BufNewFile,BufRead *.cs,*.csx               setf cs
 

diff --git a/runtime/ftplugin/cgdbrc.vim b/runtime/ftplugin/cgdbrc.vim
new file mode 100644 (file)
index 0000000..46cf135
--- /dev/null
+++ b/runtime/ftplugin/cgdbrc.vim
@@ -0,0 +1,21 @@
+" Vim filetype plugin file
+" Language:             cgdbrc
+" Maintainer:           Wu, Zhenyu <wuzhenyu@ustc.edu>
+" Documentation:        https://cgdb.github.io/docs/Configuring-CGDB.html
+" Latest Revision:      2024-04-09
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:save_cpoptions = &cpoptions
+set cpoptions&vim
+
+let b:undo_ftplugin = 'setl com< cms<'
+
+setlocal commentstring=#%s
+setlocal comments=:#
+
+let &cpoptions = s:save_cpoptions
+unlet s:save_cpoptions

diff --git a/runtime/syntax/cgdbrc.vim b/runtime/syntax/cgdbrc.vim
new file mode 100644 (file)
index 0000000..1ace370
--- /dev/null
+++ b/runtime/syntax/cgdbrc.vim
@@ -0,0 +1,16 @@
+" Vim syntax file
+" Language:             cgdbrc
+" Maintainer:           Wu, Zhenyu <wuzhenyu@ustc.edu>
+" Documentation:        https://cgdb.github.io/docs/Configuring-CGDB.html
+" Latest Revision:      2024-04-09
+
+if exists('b:current_syntax')
+  finish
+endif
+let b:current_syntax = 'cgdbrc'
+
+runtime! syntax/vim.vim
+
+syn region cgdbComment         start="^\s*\#" skip="\\$" end="$" contains=@Spell
+
+highlight default link cgdbComment Comment

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 5d42cc55e17789a3c35ccda05e9a9aeb6c2ff001..fb8df5cffa07c3060989ca6c59706b69844a4183 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -145,6 +145,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     cf: ['file.cfm', 'file.cfi', 'file.cfc'],
     cfengine: ['cfengine.conf'],
     cfg: ['file.hgrc', 'filehgrc', 'hgrc', 'some-hgrc'],
+    cgdbrc: ['cgdbrc'],
     ch: ['file.chf'],
     chaiscript: ['file.chai'],
     chaskell: ['file.chs'],

diff --git a/src/version.c b/src/version.c
index 65b5bd5b3960482ee75cce05276f3fa7263bcd4b..b313d16cc3043edba79e96a9863288f7f2b84abf 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 */
+/**/
+    304,
 /**/
     303,
 /**/