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

Merge pull request #630 from kassio/master

Browse Source 
Remove `name` option from `termopen`.
This commit is contained in:
Junegunn Choi 2016-07-30 19:05:43 +09:00 committed by GitHub
commit a6066175c6
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugin/fzf.vim
View File

@ -204,7 +204,7 @@ function! fzf#run(...) abort
try try
let oshell = &shell let oshell = &shell
set shell=sh set shell=sh
if has('nvim') && bufexists('term://*:FZF') if has('nvim') && len(filter(range(1, bufnr('$')), 'bufname(v:val) =~# ";#FZF"'))
call s:warn('FZF is already running!') call s:warn('FZF is already running!')
return [] return []
endif endif
@ -424,7 +424,7 @@ endfunction
function! s:execute_term(dict, command, temps) abort function! s:execute_term(dict, command, temps) abort
let [ppos, winopts] = s:split(a:dict) let [ppos, winopts] = s:split(a:dict)
let fzf = { 'buf': bufnr('%'), 'ppos': ppos, 'dict': a:dict, 'temps': a:temps, let fzf = { 'buf': bufnr('%'), 'ppos': ppos, 'dict': a:dict, 'temps': a:temps,
\ 'name': 'FZF', 'winopts': winopts, 'command': a:command } \ 'winopts': winopts, 'command': a:command }
function! fzf.switch_back(inplace) function! fzf.switch_back(inplace)
if a:inplace && bufnr('') == self.buf if a:inplace && bufnr('') == self.buf
" FIXME: Can't re-enter normal mode from terminal mode " FIXME: Can't re-enter normal mode from terminal mode
@ -466,7 +466,7 @@ function! s:execute_term(dict, command, temps) abort
if s:present(a:dict, 'dir') if s:present(a:dict, 'dir')
execute 'lcd' s:escape(a:dict.dir) execute 'lcd' s:escape(a:dict.dir)
endif endif
call termopen(a:command, fzf) call termopen(a:command . ';#FZF', fzf)
finally finally
if s:present(a:dict, 'dir') if s:present(a:dict, 'dir')
lcd - lcd -
@ -550,4 +550,3 @@ command! -nargs=* -complete=dir -bang FZF call s:cmd(<bang>0, <f-args>)
let &cpo = s:cpo_save let &cpo = s:cpo_save
unlet s:cpo_save unlet s:cpo_save