adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

runtime(netrw): escape filename before trying to delete it

Browse Source 
fixes: #15330

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2024-07-23 21:14:06 +02:00
parent 56904f90d1
commit 581d4a7b35
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/autoload/netrw.vim
View File

@ -17,6 +17,7 @@
" 2024 Jun 13 by Vim Project: glob() on Windows fails when a directory name contains [] (#14952) " 2024 Jun 13 by Vim Project: glob() on Windows fails when a directory name contains [] (#14952)
" 2024 Jun 23 by Vim Project: save ad restore registers when liststyle = WIDELIST (#15077, #15114) " 2024 Jun 23 by Vim Project: save ad restore registers when liststyle = WIDELIST (#15077, #15114)
" 2024 Jul 22 by Vim Project: avoid endless recursion (#15318) " 2024 Jul 22 by Vim Project: avoid endless recursion (#15318)
" 2024 Jul 23 by Vim Project: escape filename before trying to delete it (#15330)
" Former Maintainer: Charles E Campbell " Former Maintainer: Charles E Campbell
" GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
" Copyright: Copyright (C) 2016 Charles E. Campbell {{{1 " Copyright: Copyright (C) 2016 Charles E. Campbell {{{1
@ -11452,7 +11453,7 @@ fun! s:NetrwLocalRmFile(path,fname,all)
let all= a:all let all= a:all
let ok = "" let ok = ""
NetrwKeepj norm! 0 NetrwKeepj norm! 0
let rmfile= s:NetrwFile(s:ComposePath(a:path,a:fname)) let rmfile= s:NetrwFile(s:ComposePath(a:path,escape(a:fname, '\\')))
" call Decho("rmfile<".rmfile.">",'~'.expand("<slnum>")) " call Decho("rmfile<".rmfile.">",'~'.expand("<slnum>"))
if rmfile !~ '^"' && (rmfile =~ '@$' || rmfile !~ '[\/]$') if rmfile !~ '^"' && (rmfile =~ '@$' || rmfile !~ '[\/]$')
@ -11461,7 +11462,7 @@ fun! s:NetrwLocalRmFile(path,fname,all)
if !all if !all
echohl Statement echohl Statement
call inputsave() call inputsave()
let ok= input("Confirm deletion of file<".rmfile."> ","[{y(es)},n(o),a(ll),q(uit)] ") let ok= input("Confirm deletion of file <".rmfile."> ","[{y(es)},n(o),a(ll),q(uit)] ")
call inputrestore() call inputrestore()
echohl NONE echohl NONE
if ok == "" if ok == ""
@ -11485,7 +11486,7 @@ fun! s:NetrwLocalRmFile(path,fname,all)
if !all if !all
echohl Statement echohl Statement
call inputsave() call inputsave()
let ok= input("Confirm *recursive* deletion of directory<".rmfile."> ","[{y(es)},n(o),a(ll),q(uit)] ") let ok= input("Confirm *recursive* deletion of directory <".rmfile."> ","[{y(es)},n(o),a(ll),q(uit)] ")
call inputrestore() call inputrestore()
let ok= substitute(ok,'\[{y(es)},n(o),a(ll),q(uit)]\s*','','e') let ok= substitute(ok,'\[{y(es)},n(o),a(ll),q(uit)]\s*','','e')
if ok == "" if ok == ""