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

runtime(netrw): glob() on windows fails with [] in directory name

Browse Source 
fixes: #14952
closes: #14991

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2024-06-13 21:25:35 +02:00
parent d6d4e13336
commit 1487947fb6
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
runtime/autoload/netrw.vim
View File

@ -14,6 +14,7 @@
" 2024 May 10 by Vim Project: recursively delete directories by default " 2024 May 10 by Vim Project: recursively delete directories by default
" 2024 May 13 by Vim Project: prefer scp over pscp " 2024 May 13 by Vim Project: prefer scp over pscp
" 2024 Jun 04 by Vim Project: set bufhidden if buffer changed, nohidden is set and buffer shall be switched (#14915) " 2024 Jun 04 by Vim Project: set bufhidden if buffer changed, nohidden is set and buffer shall be switched (#14915)
" 2024 Jun 13 by Vim Project: glob() on Windows fails when a directory name contains [] (#14952)
" 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
@ -5798,16 +5799,20 @@ fun! s:NetrwGlob(direntry,expr,pare)
let filelist= w:netrw_treedict[a:direntry] let filelist= w:netrw_treedict[a:direntry]
endif endif
let w:netrw_liststyle= keep_liststyle let w:netrw_liststyle= keep_liststyle
elseif v:version > 704 || (v:version == 704 && has("patch656"))
let filelist= glob(s:ComposePath(fnameescape(a:direntry),a:expr),0,1,1)
if a:pare
let filelist= map(filelist,'substitute(v:val, "^.*/", "", "")')
endif
else else
let filelist= glob(s:ComposePath(fnameescape(a:direntry),a:expr),0,1) let path= s:ComposePath(fnameescape(a:direntry),a:expr)
if a:pare if has("win64")
let filelist= map(filelist,'substitute(v:val, "^.*/", "", "")') " escape [ so it is not detected as wildcard character, see :h wildcard
endif let path= substitute(path, '[', '[[]', 'g')
endif
if v:version > 704 || (v:version == 704 && has("patch656"))
let filelist= glob(path,0,1,1)
else
let filelist= glob(path,0,1)
endif
if a:pare
let filelist= map(filelist,'substitute(v:val, "^.*/", "", "")')
endif
endif endif
" call Dret("s:NetrwGlob ".string(filelist)) " call Dret("s:NetrwGlob ".string(filelist))
return filelist return filelist