From 57b947e3c3b8d52b914158979263855d785445d5 Mon Sep 17 00:00:00 2001 From: "Wu, Zhenyu" Date: Sun, 24 Nov 2024 14:34:01 +0100 Subject: [PATCH] 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 Signed-off-by: James McCoy Signed-off-by: Christian Brabandt --- runtime/filetype.vim | 6 +++--- src/testdir/test_filetype.vim | 2 +- src/version.c | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/runtime/filetype.vim b/runtime/filetype.vim index ef8c0e922e..08290d0b87 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: The Vim Project -" Last Change: 2024 Nov 19 +" Last Change: 2024 Nov 24 " Former Maintainer: Bram Moolenaar " Listen very carefully, I will say this only once @@ -646,9 +646,9 @@ au BufNewFile,BufRead *.dfy setf dafny 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 001a970aeb..4a905a889a 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -211,7 +211,7 @@ def s:GetFilenameChecks(): dict> 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 b569807722..6f5c7a4984 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 */ +/**/ + 886, /**/ 885, /**/