diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2024-05-13 22:47:29 +0200 |
|---|---|---|
| committer | Christian Clason <c.clason@uni-graz.at> | 2024-05-14 08:27:17 +0200 |
| commit | ccc0b750b7e3aa6a13c77a3950fb6713252bc798 (patch) | |
| tree | 62d681ea0da34980ec199327dca2a2a79e32fea4 | |
| parent | 025e2e07d99335e6d906fd2789c404df0408edb1 (diff) | |
| download | rneovim-ccc0b750b7e3aa6a13c77a3950fb6713252bc798.tar.gz rneovim-ccc0b750b7e3aa6a13c77a3950fb6713252bc798.tar.bz2 rneovim-ccc0b750b7e3aa6a13c77a3950fb6713252bc798.zip | |
vim-patch:43f2edc096cb
runtime(netrw): prefer scp over pscp
regression introduced in ce2ad9ffd79fe6b2307cd46b9
The current logic is a bit funny, in that it checks for an executable of
scp, then pscp and if neither exists, it uses: scp :/
Anyway, let's fall back to the logic used before the above commit.
related: vim/vim#14739
https://github.com/vim/vim/commit/43f2edc096cbf9c67095b301a1f4325866eeba36
Co-authored-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | runtime/autoload/netrw.vim | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim index 117b44b284..ae602c5be6 100644 --- a/runtime/autoload/netrw.vim +++ b/runtime/autoload/netrw.vim @@ -281,13 +281,14 @@ call s:NetrwInit("g:netrw_rcp_cmd" , "rcp") call s:NetrwInit("g:netrw_rsync_cmd", "rsync") call s:NetrwInit("g:netrw_rsync_sep", "/") if !exists("g:netrw_scp_cmd") - if executable("pscp") + if executable("scp") + call s:NetrwInit("g:netrw_scp_cmd" , "scp -q") + elseif executable("pscp") call s:NetrwInit("g:netrw_scp_cmd", 'pscp -q') else call s:NetrwInit("g:netrw_scp_cmd" , "scp -q") endif endif - call s:NetrwInit("g:netrw_sftp_cmd" , "sftp") call s:NetrwInit("g:netrw_ssh_cmd" , "ssh") |