patch 8.2.0927: some sshconfig and ssdhconfig files are not recognized

Problem:    Some sshconfig and ssdhconfig files are not recognized.
Solution:   Add filetype patterns.

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 8616a71f24b5ec8f7d0dd7a74dc2aace41fe0262..c5bc8391e27d338896d6bf1b58834798eb0ee40c 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1617,10 +1617,12 @@ au BufNewFile,BufRead *.sqlj                    setf sqlj
 au BufNewFile,BufRead *.sqr,*.sqi              setf sqr
 
 " OpenSSH configuration
-au BufNewFile,BufRead ssh_config,*/.ssh/config setf sshconfig
+au BufNewFile,BufRead ssh_config,*/.ssh/config         setf sshconfig
+au BufNewFile,BufRead */etc/ssh/ssh_config.d/*.conf    setf sshconfig
 
 " OpenSSH server configuration
-au BufNewFile,BufRead sshd_config              setf sshdconfig
+au BufNewFile,BufRead sshd_config                      setf sshdconfig
+au BufNewFile,BufRead */etc/ssh/sshd_config.d/*.conf   setf sshdconfig
 
 " Stata
 au BufNewFile,BufRead *.ado,*.do,*.imata,*.mata        setf stata

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 832446bb9f0b4f0bed1777b80ce4277f9ab28ae3..0929e14d851859412feb3f9de148bf943c4ef229 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -428,8 +428,8 @@ let s:filename_checks = {
     \ 'sqr': ['file.sqr', 'file.sqi'],
     \ 'squid': ['squid.conf'],
     \ 'srec': ['file.s19', 'file.s28', 'file.s37', 'file.mot', 'file.srec'],
-    \ 'sshconfig': ['ssh_config', '/.ssh/config'],
-    \ 'sshdconfig': ['sshd_config'],
+    \ 'sshconfig': ['ssh_config', '/.ssh/config', '/etc/ssh/ssh_config.d/file.conf', 'any/etc/ssh/ssh_config.d/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'],
     \ 'stp': ['file.stp'],

diff --git a/src/version.c b/src/version.c
index 4482491321922a0b70456a22a6fe80d0496d5dc2..32264ca87d3ac11b8957715f2bcc5af467137deb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    927,
 /**/
     926,
 /**/