Mercurial > vim

changeset 20749:dae1811e84dd v8.2.0927

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0927: some sshconfig and ssdhconfig files are not recognized Commit: https://github.com/vim/vim/commit/da84ac2a6f467d0b9eddcc8709433cda75d16a41 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jun 7 20:07:43 2020 +0200 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.
author Bram Moolenaar <Bram@vim.org>
date Sun, 07 Jun 2020 20:15:03 +0200
parents 791277e2f6be
children 020a100bfa92
files runtime/filetype.vim src/testdir/test_filetype.vim src/version.c
diffstat 3 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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'],
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    927,
+/**/
     926,
 /**/
     925,