Merge pull request #593 from edi9999/master

Add fzf_prefer_tmux option
2016-06-10 22:58:58 +09:00 · 2016-06-10 22:58:58 +09:00 · d91c3a2f5e
commit d91c3a2f5e
parent cf9c957c66 fe5db5aadc
1 changed files with 2 additions and 2 deletions
--- a/plugin/fzf.vim
+++ b/plugin/fzf.vim
@ -140,10 +140,10 @@ try
  else
    let prefix = ''
  endif
-  let tmux = !has('nvim') && s:tmux_enabled() && s:splittable(dict)
+  let tmux = (!has('nvim') || get(g:, 'fzf_prefer_tmux', 0)) && s:tmux_enabled() && s:splittable(dict)
  let command = prefix.(tmux ? s:fzf_tmux(dict) : fzf_exec).' '.optstr.' > '.temps.result

-  if has('nvim')
+  if has('nvim') && !tmux
    return s:execute_term(dict, command, temps)
  endif