diff options
-rwxr-xr-x | bin/fzf-tmux | 2 | ||||
-rw-r--r-- | plugin/fzf.vim | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bin/fzf-tmux b/bin/fzf-tmux index c7232882..e0fe77d6 100755 --- a/bin/fzf-tmux +++ b/bin/fzf-tmux @@ -82,7 +82,7 @@ while [ $# -gt 0 ]; do shift done -if [ -z "$TMUX_PANE" ]; then +if [ -z "$TMUX_PANE" ] || tmux list-panes -F '#F' | grep -q Z; then fzf "${args[@]}" exit $? fi diff --git a/plugin/fzf.vim b/plugin/fzf.vim index a149e791..1a245d99 100644 --- a/plugin/fzf.vim +++ b/plugin/fzf.vim @@ -64,7 +64,8 @@ function! s:tmux_enabled() endif let s:tmux = 0 - if exists('$TMUX') && executable(s:fzf_tmux) + let panes = system('tmux list-panes -F "#F"') + if exists('$TMUX') && executable(s:fzf_tmux) && panes !~# 'Z' let output = system('tmux -V') let s:tmux = !v:shell_error && output >= 'tmux 1.7' endif |