summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Auer <david.auer@credativ.de>2022-01-03 17:32:46 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-03 17:32:46 +0000
commit9acf2d8be93f3b50607279e7f3484b019675d0a7 (patch)
tree62a271b65654bae39a03e963a1a63a1c2832378b /src
parentad8f2485856eadb931ebd1f633ca366a40e415b8 (diff)
downloadvim-git-9acf2d8be93f3b50607279e7f3484b019675d0a7.tar.gz
patch 8.2.3995: not all sshconfig files are detected as suchv8.2.3995
Problem: Not all sshconfig files are detected as such. Solution: Adjust the patterns used for sshconfig detection. (David Auer, closes #9322)
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 58c3981a6..89dd8f204 100644
--- 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 04f06f931..b90593232 100644
--- 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,