diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-06-07 18:55:00 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-06-18 18:01:41 -0400 |
| commit | 150168b8814537c77fa005cee107b551718a7245 (patch) | |
| tree | b637ccd55e7e8fbd1d6595aa9256df8b65101a9a | |
| parent | a5bde56b371e199e36840ceb4a27e0440cbad60d (diff) | |
| download | rneovim-150168b8814537c77fa005cee107b551718a7245.tar.gz rneovim-150168b8814537c77fa005cee107b551718a7245.tar.bz2 rneovim-150168b8814537c77fa005cee107b551718a7245.zip | |
vim-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.
https://github.com/vim/vim/commit/da84ac2a6f467d0b9eddcc8709433cda75d16a41
| -rw-r--r-- | runtime/filetype.vim | 6 | ||||
| -rw-r--r-- | src/nvim/testdir/test_filetype.vim | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 383a45b9d3..141008a5ab 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1613,10 +1613,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/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index ffd2cee80f..a9e43b9aca 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/testdir/test_filetype.vim @@ -427,8 +427,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'], |