patch 9.1.0886: filetype: debian control file not detected
Problem: filetype: debian control file not detected
Solution: detect 'debian/control' files as debcontrol filetype
(author)
closes: #16067
Signed-off-by: Wu, Zhenyu <wuzhenyu@ustc.edu>
Signed-off-by: James McCoy <jamessan@debian.org>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index ef8c0e9..08290d0 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: 2024 Nov 19
+" Last Change: 2024 Nov 24
" Former Maintainer: Bram Moolenaar <Bram@vim.org>
" Listen very carefully, I will say this only once
@@ -646,9 +646,9 @@
au BufRead,BufNewfile *.dart,*.drt setf dart
" Debian Control
-au BufNewFile,BufRead */debian/control setf debcontrol
+au BufNewFile,BufRead */{debian,DEBIAN}/control setf debcontrol
au BufNewFile,BufRead control
- \ if getline(1) =~ '^Source:'
+ \ if getline(1) =~ '^Source:\|^Package:'
\| setf debcontrol
\| endif
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 001a970..4a905a8 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -211,7 +211,7 @@
datascript: ['file.ds'],
dcd: ['file.dcd'],
debchangelog: ['changelog.Debian', 'changelog.dch', 'NEWS.Debian', 'NEWS.dch', '/debian/changelog'],
- debcontrol: ['/debian/control', 'any/debian/control'],
+ debcontrol: ['/debian/control', 'any/debian/control', 'any/DEBIAN/control'],
debcopyright: ['/debian/copyright', 'any/debian/copyright'],
debsources: ['/etc/apt/sources.list', '/etc/apt/sources.list.d/file.list', 'any/etc/apt/sources.list', 'any/etc/apt/sources.list.d/file.list'],
deb822sources: ['/etc/apt/sources.list.d/file.sources', 'any/etc/apt/sources.list.d/file.sources'],
diff --git a/src/version.c b/src/version.c
index b569807..6f5c7a4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 886,
+/**/
885,
/**/
884,