Commit: runtime(netrw): minor changes to fix move cmd on windows (#13823)

6 views
Skip to first unread message

Christian Brabandt

unread,
Jan 17, 2024, 3:45:08 PM1/17/24
to vim...@googlegroups.com
runtime(netrw): minor changes to fix move cmd on windows (#13823)

Commit: https://github.com/vim/vim/commit/6e5a6c9965f667712494ae0a9df8a407267cc72f
Author: MiguelBarro <45819833+M...@users.noreply.github.com>
Date: Wed Jan 17 21:35:36 2024 +0100

runtime(netrw): minor changes to fix move cmd on windows (https://github.com/vim/vim/issues/13823)

Signed-off-by: GuyBrush <miguel...@live.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index bcb1f2475..768954eda 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -7862,7 +7862,7 @@ fun! s:NetrwMarkFileMove(islocal)
let movecmd = netrw#WinPath(movecmd).movecmdargs
" call Decho("windows exception: movecmd<".movecmd."> (#1: had a space)",'~'.expand("<slnum>"))
else
- let movecmd = netrw#WinPath(movecmd)
+ let movecmd = netrw#WinPath(g:netrw_localmovecmd)
" call Decho("windows exception: movecmd<".movecmd."> (#2: no space)",'~'.expand("<slnum>"))
endif
else
@@ -7876,10 +7876,6 @@ fun! s:NetrwMarkFileMove(islocal)
endif
if !g:netrw_cygwin && (has("win32") || has("win95") || has("win64") || has("win16"))
let fname= substitute(fname,'/','\','g')
- if g:netrw_keepdir
- " Jul 19, 2022: fixing file move when g:netrw_keepdir is 1
- let fname= b:netrw_curdir."\".fname
- endif
endif
" call Decho("system(".movecmd." ".s:ShellEscape(fname)." ".tgt.")",'~'.expand("<slnum>"))
let ret= system(movecmd.g:netrw_localmovecmdopt." ".s:ShellEscape(fname)." ".tgt)
Reply all
Reply to author
Forward
0 new messages