aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2024-01-18 08:26:25 +0100
committerChristian Clason <c.clason@uni-graz.at>2024-01-18 08:42:00 +0100
commit223a6afd8fb438f5fed029e3509c2dd095029db6 (patch)
tree3d4c58dc7d8e3657a221eed6beea1b5523acb666
parent06aebfa9984ff304fd22734e2dc6cbe1a590389b (diff)
downloadrneovim-223a6afd8fb438f5fed029e3509c2dd095029db6.tar.gz
rneovim-223a6afd8fb438f5fed029e3509c2dd095029db6.tar.bz2
rneovim-223a6afd8fb438f5fed029e3509c2dd095029db6.zip
vim-patch:6e5a6c9965f6
runtime(netrw): minor changes to fix move cmd on windows (vim/vim#13823) https://github.com/vim/vim/commit/6e5a6c9965f667712494ae0a9df8a407267cc72f Co-authored-by: MiguelBarro <45819833+MiguelBarro@users.noreply.github.com>
-rw-r--r--runtime/autoload/netrw.vim6
1 files changed, 1 insertions, 5 deletions
diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index 811a9501fe..4decfbced7 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -7802,7 +7802,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
@@ -7816,10 +7816,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)