summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorBryan Head <bryan.head@gmail.com>2015-04-11 12:27:50 -0500
committerBryan Head <bryan.head@gmail.com>2015-04-11 12:44:14 -0500
commit82bea6758a99a1c6b9ac13f92e0959a851604f5a (patch)
tree2422b34e5c8a172a633ce249cd921232afeafd98 /plugin
parent797f42ecc614f732080de70b1006616f435de4f0 (diff)
downloadfzf-82bea6758a99a1c6b9ac13f92e0959a851604f5a.tar.gz
Move active check to fzf#run.
Diffstat (limited to 'plugin')
-rw-r--r--plugin/fzf.vim12
1 files changed, 6 insertions, 6 deletions
diff --git a/plugin/fzf.vim b/plugin/fzf.vim
index 2066d708..135a3a24 100644
--- a/plugin/fzf.vim
+++ b/plugin/fzf.vim
@@ -98,6 +98,12 @@ function! s:upgrade(dict)
endfunction
function! fzf#run(...) abort
+ if has('nvim') && bufexists('[FZF]')
+ echohl WarningMsg
+ echomsg 'FZF is already running!'
+ echohl NONE
+ return []
+ endif
let dict = exists('a:1') ? s:upgrade(a:1) : {}
let temps = { 'result': tempname() }
let optstr = get(dict, 'options', '')
@@ -325,12 +331,6 @@ function! s:cmd_callback(lines) abort
endfunction
function! s:cmd(bang, ...) abort
- if bufexists('[FZF]')
- echohl WarningMsg
- echomsg 'FZF is already running!'
- echohl NONE
- return
- endif
let args = copy(a:000)
if !s:legacy
let args = insert(args, '--expect=ctrl-t,ctrl-x,ctrl-v', 0)