diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2024-05-09 20:31:08 +0200 |
|---|---|---|
| committer | Christian Clason <c.clason@uni-graz.at> | 2024-05-10 00:05:52 +0200 |
| commit | a7a9b205b5ad6f57a413f98c25a53edf160e5f37 (patch) | |
| tree | 0e44e5acb3764d00cddf7b76a376cdc3a8322495 | |
| parent | c18d7941effaf60810a0891d8aa2dd9cd0170526 (diff) | |
| download | rneovim-a7a9b205b5ad6f57a413f98c25a53edf160e5f37.tar.gz rneovim-a7a9b205b5ad6f57a413f98c25a53edf160e5f37.tar.bz2 rneovim-a7a9b205b5ad6f57a413f98c25a53edf160e5f37.zip | |
vim-patch:ce2ad9ffd79f
runtime(netrw): Remove hardcoded private.ppk logic from netrw
closes: vim/vim#14739
https://github.com/vim/vim/commit/ce2ad9ffd79fe6b2307cd46b96af7d99c0dd646e
Co-authored-by: Nir Lichtman <nir@lichtman.org>
| -rw-r--r-- | runtime/autoload/netrw.vim | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim index fa5e205f49..ac74d047ac 100644 --- a/runtime/autoload/netrw.vim +++ b/runtime/autoload/netrw.vim @@ -10,6 +10,7 @@ " 2024 Feb 29 by Vim Project: handle symlinks in tree mode correctly " 2024 Apr 03 by Vim Project: detect filetypes for remote edited files " 2024 May 08 by Vim Project: cleanup legacy Win9X checks +" 2024 May 09 by Vim Project: remove hard-coded private.ppk " Former Maintainer: Charles E Campbell " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim " Copyright: Copyright (C) 2016 Charles E. Campbell {{{1 @@ -279,14 +280,8 @@ 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("scp") - call s:NetrwInit("g:netrw_scp_cmd" , "scp -q") - elseif executable("pscp") - if has("win32") && filereadable('c:\private.ppk') - call s:NetrwInit("g:netrw_scp_cmd", 'pscp -i c:\private.ppk') - else - call s:NetrwInit("g:netrw_scp_cmd", 'pscp -q') - endif + if executable("pscp") + call s:NetrwInit("g:netrw_scp_cmd", 'pscp -q') else call s:NetrwInit("g:netrw_scp_cmd" , "scp -q") endif @@ -367,10 +362,6 @@ endif call s:NetrwInit("g:netrw_keepdir",1) if !exists("g:netrw_list_cmd") if g:netrw_scp_cmd =~ '^pscp' && executable("pscp") - if has("win32") && filereadable("c:\\private.ppk") - " provide a pscp-based listing command - let g:netrw_scp_cmd ="pscp -i C:\\private.ppk" - endif if exists("g:netrw_list_cmd_options") let g:netrw_list_cmd= g:netrw_scp_cmd." -ls USEPORT HOSTNAME: ".g:netrw_list_cmd_options else |