patch 9.1.0596: filetype: devscripts config files are not recognized

Problem:  filetype: Debian devscripts config files are not recognized
Solution: detect devscripts.conf and .devscripts files as sh filetype
          (sourced by /bin/sh)

closes: #15227

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 2ec0589b53e6519e4ab30a7e6012fe70bb3204a2..6275e0aa5a2c3d0a47bb6c587bf0bb518409a04d 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -510,6 +510,9 @@ au BufNewFile,BufRead *.cu,*.cuh            setf cuda
 " Cue
 au BufNewFile,BufRead *.cue                    setf cue
 
+" Debian devscripts
+au BufNewFile,BufRead devscripts.conf,.devscripts      setf sh
+
 " Dockerfile; Podman uses the same syntax with name Containerfile
 " Also see Dockerfile.* below.
 au BufNewFile,BufRead Containerfile,Dockerfile,dockerfile,*.[dD]ockerfile      setf dockerfile

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index c3c0139c2b443004e23410d78b9d7987a7dc88dd..24948a20c9198cfe6cffff94b094014c1f37eec9 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -652,7 +652,8 @@ def s:GetFilenameChecks(): dict<list<string>>
     sh: ['.bashrc', '.bash_profile', '.bash-profile', '.bash_logout', '.bash-logout', '.bash_aliases', '.bash-aliases', '.bash_history', '.bash-history',
          '/tmp/bash-fc-3Ozjlw', '/tmp/bash-fc.3Ozjlw', 'PKGBUILD', 'APKBUILD', 'file.bash', '/usr/share/doc/bash-completion/filter.sh',
          '/etc/udev/cdsymlinks.conf', 'any/etc/udev/cdsymlinks.conf', 'file.bats', '.ash_history', 'any/etc/neofetch/config.conf', '.xprofile',
-         'user-dirs.defaults', 'user-dirs.dirs', 'makepkg.conf', '.makepkg.conf', 'file.mdd', 'file.cygport', '.env', '.envrc'],
+         'user-dirs.defaults', 'user-dirs.dirs', 'makepkg.conf', '.makepkg.conf', 'file.mdd', 'file.cygport', '.env', '.envrc', 'devscripts.conf',
+         '.devscripts'],
     sieve: ['file.siv', 'file.sieve'],
     sil: ['file.sil'],
     simula: ['file.sim'],

diff --git a/src/version.c b/src/version.c
index 5cff0a3d6ee4f73ab120e2e959dbd2b92f5b3ec0..e989d6e7c07212d6e5a48a47558b15f11cb171ac 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 */
+/**/
+    596,
 /**/
     595,
 /**/