wyj/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-09-17 20:58:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:0f5effb: runtime(netrw): delete confirmation not strict enough

Browse Source 
fixes: vim/vim#15680

0f5effbd1f

Co-authored-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Clason 2024-09-15 19:31:06 +02:00
parent f408603f4f
commit 5e7933693b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
runtime/autoload/netrw.vim
View File

@ -23,6 +23,7 @@
" 2024 Aug 15 by Vim Project: style changes, prevent E121 (#15501) " 2024 Aug 15 by Vim Project: style changes, prevent E121 (#15501)
" 2024 Aug 22 by Vim Project: fix mf-selection highlight (#15551) " 2024 Aug 22 by Vim Project: fix mf-selection highlight (#15551)
" 2024 Aug 22 by Vim Project: adjust echo output of mx command (#15550) " 2024 Aug 22 by Vim Project: adjust echo output of mx command (#15550)
" 2024 Sep 15 by Vim Project: more strict confirmation dialog (#15680)
" }}} " }}}
" Former Maintainer: Charles E Campbell " Former Maintainer: Charles E Campbell
" GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
@ -11275,7 +11276,7 @@ fun! s:NetrwLocalRm(path) range
let ok= s:NetrwLocalRmFile(a:path,fname,all) let ok= s:NetrwLocalRmFile(a:path,fname,all)
if ok =~# 'q\%[uit]' || ok == "no" if ok =~# 'q\%[uit]' || ok == "no"
break break
elseif ok =~# 'a\%[ll]' elseif ok =~# '^a\%[ll]$'
let all= 1 let all= 1
endif endif
endfor endfor
@ -11304,7 +11305,7 @@ fun! s:NetrwLocalRm(path) range
let ok= s:NetrwLocalRmFile(a:path,curword,all) let ok= s:NetrwLocalRmFile(a:path,curword,all)
if ok =~# 'q\%[uit]' || ok == "no" if ok =~# 'q\%[uit]' || ok == "no"
break break
elseif ok =~# 'a\%[ll]' elseif ok =~# '^a\%[ll]$'
let all= 1 let all= 1
endif endif
let ctr= ctr + 1 let ctr= ctr + 1
@ -11351,12 +11352,12 @@ fun! s:NetrwLocalRmFile(path,fname,all)
" call Decho("response: ok<".ok.">",'~'.expand("<slnum>")) " call Decho("response: ok<".ok.">",'~'.expand("<slnum>"))
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')
" call Decho("response: ok<".ok."> (after sub)",'~'.expand("<slnum>")) " call Decho("response: ok<".ok."> (after sub)",'~'.expand("<slnum>"))
if ok =~# 'a\%[ll]' if ok =~# '^a\%[ll]$'
let all= 1 let all= 1
endif endif
endif endif
if all || ok =~# 'y\%[es]' || ok == "" if all || ok =~# '^y\%[es]$' || ok == ""
let ret= s:NetrwDelete(rmfile) let ret= s:NetrwDelete(rmfile)
" call Decho("errcode=".v:shell_error." ret=".ret,'~'.expand("<slnum>")) " call Decho("errcode=".v:shell_error." ret=".ret,'~'.expand("<slnum>"))
endif endif
@ -11372,13 +11373,13 @@ fun! s:NetrwLocalRmFile(path,fname,all)
if ok == "" if ok == ""
let ok="no" let ok="no"
endif endif
if ok =~# 'a\%[ll]' if ok =~# '^a\%[ll]$'
let all= 1 let all= 1
endif endif
endif endif
let rmfile= substitute(rmfile,'[\/]$','','e') let rmfile= substitute(rmfile,'[\/]$','','e')
if all || ok =~# 'y\%[es]' || ok == "" if all || ok =~# '^y\%[es]$' || ok == ""
if delete(rmfile,"rf") if delete(rmfile,"rf")
call netrw#ErrorMsg(s:ERROR,"unable to delete directory <".rmfile.">!",103) call netrw#ErrorMsg(s:ERROR,"unable to delete directory <".rmfile.">!",103)
endif endif