Merge pull request #31523 from zeertzjq/vim-eda923e

vim-patch: netrw fixes
This commit is contained in:
zeertzjq 2024-12-09 09:35:11 +08:00 committed by GitHub
commit 30726c778c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -38,6 +38,8 @@
" 2024 Nov 14 by Vim Project: small fixes to netrw#BrowseX (#16056) " 2024 Nov 14 by Vim Project: small fixes to netrw#BrowseX (#16056)
" 2024 Nov 23 by Vim Project: update decompress defaults (#16104) " 2024 Nov 23 by Vim Project: update decompress defaults (#16104)
" 2024 Nov 23 by Vim Project: fix powershell escaping issues (#16094) " 2024 Nov 23 by Vim Project: fix powershell escaping issues (#16094)
" 2024 Dec 04 by Vim Project: do not detach for gvim (#16168)
" 2024 Dec 08 by Vim Project: check the first arg of netrw_browsex_viewer for being executable (#16185)
" }}} " }}}
" Former Maintainer: Charles E Campbell " Former Maintainer: Charles E Campbell
" GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
@ -5040,7 +5042,7 @@ if has('unix')
endfun endfun
else else
fun! netrw#Launch(args) fun! netrw#Launch(args)
exe ':silent ! nohup' a:args s:redir() '&' | redraw! exe ':silent ! nohup' a:args s:redir() (has('gui_running') ? '' : '&') | redraw!
endfun endfun
endif endif
elseif has('win32') elseif has('win32')
@ -5070,7 +5072,9 @@ elseif executable('open')
endif endif
fun! s:viewer() fun! s:viewer()
if exists('g:netrw_browsex_viewer') && executable(g:netrw_browsex_viewer) " g:netrw_browsex_viewer could be a string of program + its arguments,
" test if first argument is executable
if exists('g:netrw_browsex_viewer') && executable(split(g:netrw_browsex_viewer)[0])
" extract any viewing options. Assumes that they're set apart by spaces. " extract any viewing options. Assumes that they're set apart by spaces.
" call Decho("extract any viewing options from g:netrw_browsex_viewer<".g:netrw_browsex_viewer.">",'~'.expand("<slnum>")) " call Decho("extract any viewing options from g:netrw_browsex_viewer<".g:netrw_browsex_viewer.">",'~'.expand("<slnum>"))
if g:netrw_browsex_viewer =~ '\s' if g:netrw_browsex_viewer =~ '\s'