diff options
| author | Junegunn Choi <junegunn.c@gmail.com> | 2020-04-01 23:43:35 +0900 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2020-04-03 13:23:15 +0900 |
| commit | 540bfd7a72c050dd2f47fe1f944039d7b416c45e (patch) | |
| tree | 1c461462e7fa6926c42c1fdb7f9da2ff101f599b /shell | |
| parent | 8fbed2b13ab1952eaebc9ebafc916436f818ec4a (diff) | |
[fzf-tmux] Fall back to plain fzf when split failed
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/completion.bash | 2 | ||||
| -rw-r--r-- | shell/completion.zsh | 2 | ||||
| -rw-r--r-- | shell/key-bindings.bash | 2 | ||||
| -rw-r--r-- | shell/key-bindings.zsh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/shell/completion.bash b/shell/completion.bash index 377afe56..2aec1d64 100644 --- a/shell/completion.bash +++ b/shell/completion.bash @@ -37,7 +37,7 @@ bind '"\e[0n": redraw-current-line' __fzf_comprun() { if [ "$(type -t _fzf_comprun 2>&1)" = function ]; then _fzf_comprun "$@" - elif [ -n "$TMUX_PANE" ] && { [ "${FZF_TMUX:-0}" != 0 ] && [ ${LINES:-40} -gt 15 ] || [ -n "$FZF_TMUX_OPTS" ]; }; then + elif [ -n "$TMUX_PANE" ] && { [ "${FZF_TMUX:-0}" != 0 ] || [ -n "$FZF_TMUX_OPTS" ]; }; then shift fzf-tmux ${FZF_TMUX_OPTS:--d${FZF_TMUX_HEIGHT:-40%}} -- "$@" else diff --git a/shell/completion.zsh b/shell/completion.zsh index e791b3a7..4c7922e5 100644 --- a/shell/completion.zsh +++ b/shell/completion.zsh @@ -99,7 +99,7 @@ fi __fzf_comprun() { if [[ "$(type _fzf_comprun 2>&1)" =~ function ]]; then _fzf_comprun "$@" - elif [ -n "$TMUX_PANE" ] && { [ "${FZF_TMUX:-0}" != 0 ] && [ ${LINES:-40} -gt 15 ] || [ -n "$FZF_TMUX_OPTS" ]; }; then + elif [ -n "$TMUX_PANE" ] && { [ "${FZF_TMUX:-0}" != 0 ] || [ -n "$FZF_TMUX_OPTS" ]; }; then shift fzf-tmux ${(Q)${(Z+n+)FZF_TMUX_OPTS:--d${FZF_TMUX_HEIGHT:-40%}}} -- "$@" else diff --git a/shell/key-bindings.bash b/shell/key-bindings.bash index a0b9eae0..e157b076 100644 --- a/shell/key-bindings.bash +++ b/shell/key-bindings.bash @@ -27,7 +27,7 @@ __fzf_select__() { if [[ $- =~ i ]]; then __fzfcmd() { - [ -n "$TMUX_PANE" ] && { [ "${FZF_TMUX:-0}" != 0 ] && [ ${LINES:-40} -gt 15 ] || [ -n "$FZF_TMUX_OPTS" ]; } && + [ -n "$TMUX_PANE" ] && { [ "${FZF_TMUX:-0}" != 0 ] || [ -n "$FZF_TMUX_OPTS" ]; } && echo "fzf-tmux ${FZF_TMUX_OPTS:--d${FZF_TMUX_HEIGHT:-40%}} -- " || echo "fzf" } diff --git a/shell/key-bindings.zsh b/shell/key-bindings.zsh index f8cb7821..19608926 100644 --- a/shell/key-bindings.zsh +++ b/shell/key-bindings.zsh @@ -54,7 +54,7 @@ __fsel() { } __fzfcmd() { - [ -n "$TMUX_PANE" ] && { [ "${FZF_TMUX:-0}" != 0 ] && [ ${LINES:-40} -gt 15 ] || [ -n "$FZF_TMUX_OPTS" ]; } && + [ -n "$TMUX_PANE" ] && { [ "${FZF_TMUX:-0}" != 0 ] || [ -n "$FZF_TMUX_OPTS" ]; } && echo "fzf-tmux ${FZF_TMUX_OPTS:--d${FZF_TMUX_HEIGHT:-40%}} -- " || echo "fzf" } |