summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Brabandt <cb@256bit.org>2024-07-06 17:39:18 +0200
committerChristian Brabandt <cb@256bit.org>2024-07-06 17:39:18 +0200
commitf095539b3900d76f5eeaaa0897c6abf970829b31 (patch)
tree11aeec5497831525ec1f6acb7590dadcac428671
parentf3daa4525b1816e475fbfe7add6f3c4a33b13944 (diff)
patch 9.1.0536: filetype: zone files are not recognizedv9.1.0536
Problem: filetype: zone files are not recognized (rpdprd) Solution: Detect '*.zone' files as bindzone filetype fixes: #14222 Signed-off-by: Christian Brabandt <cb@256bit.org>
-rw-r--r--runtime/filetype.vim1
-rw-r--r--runtime/ftplugin/bindzone.vim16
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
4 files changed, 20 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c814baa236..ba22ad4207 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -256,6 +256,7 @@ au BufNewFile,BufRead named*.conf,rndc*.conf,rndc*.key setf named
" BIND zone
au BufNewFile,BufRead named.root setf bindzone
+au BufNewFile,BufRead *.zone setf bindzone
au BufNewFile,BufRead *.db call dist#ft#BindzoneCheck('')
" Blade
diff --git a/runtime/ftplugin/bindzone.vim b/runtime/ftplugin/bindzone.vim
new file mode 100644
index 0000000000..f9e5f4ba3c
--- /dev/null
+++ b/runtime/ftplugin/bindzone.vim
@@ -0,0 +1,16 @@
+" Vim filetype plugin file
+" Language: bind zone file
+" Maintainer: This runtime file is looking for a new maintainer.
+" Last Change: 2024 Jul 06
+
+if exists("b:did_ftplugin")
+ finish
+endif
+let b:did_ftplugin=1
+
+setlocal comments=b:;
+setlocal commentstring=;\ %s
+setlocal formatoptions-=t
+setlocal formatoptions+=crq
+
+let b:undo_ftplugin = "setlocal com< cms< fo<"
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index a3d88910bc..d6491be424 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -121,7 +121,7 @@ def s:GetFilenameChecks(): dict<list<string>>
beancount: ['file.beancount'],
bib: ['file.bib'],
bicep: ['file.bicep', 'file.bicepparam'],
- bindzone: ['named.root', '/bind/db.file', '/named/db.file', 'any/bind/db.file', 'any/named/db.file'],
+ bindzone: ['named.root', '/bind/db.file', '/named/db.file', 'any/bind/db.file', 'any/named/db.file', 'foobar.zone'],
bitbake: ['file.bb', 'file.bbappend', 'file.bbclass', 'build/conf/local.conf', 'meta/conf/layer.conf', 'build/conf/bbappend.conf', 'meta-layer/conf/distro/foo.conf'],
blade: ['file.blade.php'],
blank: ['file.bl'],
diff --git a/src/version.c b/src/version.c
index ffbc13eeca..359605b8c2 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 */
/**/
+ 536,
+/**/
535,
/**/
534,