diff options
| author | Junegunn Choi <junegunn.c@gmail.com> | 2015-12-13 01:11:02 +0900 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2015-12-13 01:11:02 +0900 |
| commit | ac0a62e494fb3647a166a57d25ad67750d75acf6 (patch) | |
| tree | 8f6a204a79bafc44df4d86a742a5ac5286162868 | |
| parent | a07944a5bba77163f05d0d751b970d6d1b597f76 (diff) | |
| parent | 54b4b0c56fca309d1f59bae66a32547d03ced916 (diff) | |
Merge pull request #446 from chaoren/master
Fix CTRL-T in tmux
| -rw-r--r-- | shell/key-bindings.bash | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/shell/key-bindings.bash b/shell/key-bindings.bash index e9bea78d..36c36fca 100644 --- a/shell/key-bindings.bash +++ b/shell/key-bindings.bash @@ -25,7 +25,15 @@ __fzf_select_tmux__() { else height="-l $height" fi - tmux split-window $height "cd $(printf %q "$PWD"); FZF_CTRL_T_COMMAND=$(printf %q "$FZF_CTRL_T_COMMAND") bash -c 'source ~/.fzf.bash; tmux send-keys -t $TMUX_PANE \"\$(__fzf_select__)\"'" + tmux split-window $height "cd $(printf %q "$PWD"); PATH=$(printf %q "$PATH") FZF_CTRL_T_COMMAND=$(printf %q "$FZF_CTRL_T_COMMAND") bash -c 'source \"${BASH_SOURCE[0]}\"; tmux send-keys -t $TMUX_PANE \"\$(__fzf_select__)\"'" +} + +__fzf_select_tmux_auto__() { + if [ ${FZF_TMUX:-1} -ne 0 -a ${LINES:-40} -gt 15 ]; then + __fzf_select_tmux__ + else + tmux send-keys -t $TMUX_PANE "$(__fzf_select__)" + fi } __fzf_cd__() { @@ -50,7 +58,11 @@ __fzf_history__() ( ) __use_tmux=0 -[ -n "$TMUX_PANE" -a ${FZF_TMUX:-1} -ne 0 -a ${LINES:-40} -gt 15 ] && __use_tmux=1 +__use_tmux_auto=0 +if [ -n "$TMUX_PANE" ]; then + [ ${FZF_TMUX:-1} -ne 0 -a ${LINES:-40} -gt 15 ] && __use_tmux=1 + [ $BASH_VERSINFO -gt 3 ] && __use_tmux_auto=1 +fi if [ -z "$(set -o | \grep '^vi.*on')" ]; then # Required to refresh the prompt after fzf @@ -58,7 +70,9 @@ if [ -z "$(set -o | \grep '^vi.*on')" ]; then bind '"\e^": history-expand-line' # CTRL-T - Paste the selected file path into the command line - if [ $__use_tmux -eq 1 ]; then + if [ $__use_tmux_auto -eq 1 ]; then + bind -x '"\C-t": "__fzf_select_tmux_auto__"' + elif [ $__use_tmux -eq 1 ]; then bind '"\C-t": " \C-u \C-a\C-k$(__fzf_select_tmux__)\e\C-e\C-y\C-a\C-d\C-y\ey\C-h"' else bind '"\C-t": " \C-u \C-a\C-k$(__fzf_select__)\e\C-e\C-y\C-a\C-y\ey\C-h\C-e\er \C-h"' @@ -76,7 +90,9 @@ else # CTRL-T - Paste the selected file path into the command line # - FIXME: Selected items are attached to the end regardless of cursor position - if [ $__use_tmux -eq 1 ]; then + if [ $__use_tmux_auto -eq 1 ]; then + bind -x '"\C-t": "__fzf_select_tmux_auto__"' + elif [ $__use_tmux -eq 1 ]; then bind '"\C-t": "\e$a \eddi$(__fzf_select_tmux__)\C-x\C-e\e0P$xa"' else bind '"\C-t": "\e$a \eddi$(__fzf_select__)\C-x\C-e\e0Px$a \C-x\C-r\exa "' @@ -92,6 +108,6 @@ else bind -m vi-command '"\ec": "i\ec"' fi -unset __use_tmux +unset -v __use_tmux __use_tmux_auto fi |