From b57e6cff7e54bd8dfcb60b2917ffe53d67507046 Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Sun, 16 Feb 2020 12:32:20 +0900
Subject: [PATCH] [vim] Pick up fzf-tmux on $PATH when bin/fzf-tmux is not
found
Close #1874
---
plugin/fzf.vim | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/plugin/fzf.vim b/plugin/fzf.vim
index 0f7a5be4..17d1dce1 100644
--- a/plugin/fzf.vim
+++ b/plugin/fzf.vim
@@ -164,7 +164,7 @@ function! s:fzf_exec()
endfunction
function! s:tmux_enabled()
- if has('gui_running')
+ if has('gui_running') || !exists('$TMUX')
return 0
endif
@@ -173,10 +173,16 @@ function! s:tmux_enabled()
endif
let s:tmux = 0
- if exists('$TMUX') && executable(s:fzf_tmux)
- let output = system('tmux -V')
- let s:tmux = !v:shell_error && output >= 'tmux 1.7'
+ if !executable(s:fzf_tmux)
+ if executable('fzf-tmux')
+ let s:fzf_tmux = 'fzf-tmux'
+ else
+ return 0
+ endif
endif
+
+ let output = system('tmux -V')
+ let s:tmux = !v:shell_error && output >= 'tmux 1.7'
return s:tmux
endfunction
--
GitLab