stonewareslord/fzf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[neovim] Set &shell to sh (again) after opening a new window

Browse Source 
Close #1031
This commit is contained in:
Junegunn Choi 2017-08-30 18:58:28 +09:00
parent b27dc3eb17
commit 48adad5454
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugin/fzf.vim
View File

@ -328,17 +328,20 @@ function! fzf#wrap(...)
return opts return opts
endfunction endfunction
function! fzf#run(...) abort function! s:use_sh()
try let [shell, shellslash] = [&shell, &shellslash]
let oshell = &shell
let useshellslash = &shellslash
if s:is_win if s:is_win
set shell=cmd.exe set shell=cmd.exe
set noshellslash set noshellslash
else else
set shell=sh set shell=sh
endif endif
return [shell, shellslash]
endfunction
function! fzf#run(...) abort
try
let [shell, shellslash] = s:use_sh()
let dict = exists('a:1') ? s:upgrade(a:1) : {} let dict = exists('a:1') ? s:upgrade(a:1) : {}
let temps = { 'result': s:fzf_tempname() } let temps = { 'result': s:fzf_tempname() }
@ -405,8 +408,7 @@ try
call s:callback(dict, lines) call s:callback(dict, lines)
return lines return lines
finally finally
let &shell = oshell let [&shell, &shellslash] = [shell, shellslash]
let &shellslash = useshellslash
endtry endtry
endfunction endfunction
@ -625,6 +627,7 @@ function! s:execute_term(dict, command, temps) abort
let winrest = winrestcmd() let winrest = winrestcmd()
let pbuf = bufnr('') let pbuf = bufnr('')
let [ppos, winopts] = s:split(a:dict) let [ppos, winopts] = s:split(a:dict)
call s:use_sh()
let b:fzf = a:dict let b:fzf = a:dict
let fzf = { 'buf': bufnr(''), 'pbuf': pbuf, 'ppos': ppos, 'dict': a:dict, 'temps': a:temps, let fzf = { 'buf': bufnr(''), 'pbuf': pbuf, 'ppos': ppos, 'dict': a:dict, 'temps': a:temps,
\ 'winopts': winopts, 'winrest': winrest, 'lines': &lines, \ 'winopts': winopts, 'winrest': winrest, 'lines': &lines,