patch 8.2.3995: not all sshconfig files are detected as such

Problem:    Not all sshconfig files are detected as such.
Solution:   Adjust the patterns used for sshconfig detection. (David Auer,
            closes #9322)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index d34db183d8eab2c637464e964077f1279ba30f61..c92ae69e1d4a0efe20550a961caead712259589f 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1778,8 +1778,8 @@ au BufNewFile,BufRead *.sqr,*.sqi         setf sqr
 au BufNewFile,BufRead *.nut                    setf squirrel
 
 " OpenSSH configuration
-au BufNewFile,BufRead ssh_config,*/.ssh/config         setf sshconfig
-au BufNewFile,BufRead */etc/ssh/ssh_config.d/*.conf    setf sshconfig
+au BufNewFile,BufRead ssh_config,*/.ssh/config,*/.ssh/*.conf   setf sshconfig
+au BufNewFile,BufRead */etc/ssh/ssh_config.d/*.conf            setf sshconfig
 
 " OpenSSH server configuration
 au BufNewFile,BufRead sshd_config                      setf sshdconfig

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 58c3981a652a14a24e7af9377a3cf0a052bb0aff..89dd8f2043ca5ca7d0bcef948df06121455bb9d5 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -482,7 +482,7 @@ let s:filename_checks = {
     \ 'squid': ['squid.conf'],
     \ 'squirrel': ['file.nut'],
     \ 'srec': ['file.s19', 'file.s28', 'file.s37', 'file.mot', 'file.srec'],
-    \ 'sshconfig': ['ssh_config', '/.ssh/config', '/etc/ssh/ssh_config.d/file.conf', 'any/etc/ssh/ssh_config.d/file.conf', 'any/.ssh/config'],
+    \ 'sshconfig': ['ssh_config', '/.ssh/config', '/etc/ssh/ssh_config.d/file.conf', 'any/etc/ssh/ssh_config.d/file.conf', 'any/.ssh/config', 'any/.ssh/file.conf'],
     \ 'sshdconfig': ['sshd_config', '/etc/ssh/sshd_config.d/file.conf', 'any/etc/ssh/sshd_config.d/file.conf'],
     \ 'st': ['file.st'],
     \ 'stata': ['file.ado', 'file.do', 'file.imata', 'file.mata'],

diff --git a/src/version.c b/src/version.c
index 04f06f93151db4814aa0f0ead63be19ad40c3f32..b905932326b9eacabfd6e3b26fa0df4da15b92db 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3995,
 /**/
     3994,
 /**/