Mercurial > vim

changeset 26933:959f943e6dd1 v8.2.3995

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3995: not all sshconfig files are detected as such Commit: https://github.com/vim/vim/commit/9acf2d8be93f3b50607279e7f3484b019675d0a7 Author: David Auer <david.auer@credativ.de> Date: Mon Jan 3 17:32:46 2022 +0000 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)
author Bram Moolenaar <Bram@vim.org>
date Mon, 03 Jan 2022 18:45:03 +0100
parents db2a59d62a69
children 2d3dd8065e25
files runtime/filetype.vim src/testdir/test_filetype.vim src/version.c
diffstat 3 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1778,8 +1778,8 @@ au BufNewFile,BufRead *.sqr,*.sqi		setf 
 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
--- 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'],
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3995,
+/**/
     3994,
 /**/
     3993,