diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/key-bindings.bash | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/shell/key-bindings.bash b/shell/key-bindings.bash index 042e005c..fca570bf 100644 --- a/shell/key-bindings.bash +++ b/shell/key-bindings.bash @@ -85,6 +85,15 @@ if [ -z "$(set -o | \grep '^vi.*on')" ]; then # ALT-C - cd into the selected directory bind '"\ec": " \C-e\C-u$(__fzf_cd__)\e\C-e\er\C-m"' else + # We'd usually use "\e" to enter vi-movement-mode so we can do our magic, + # but this incurs a very noticeable delay of a half second or so, + # because many other commands start with "\e". + # Instead, we bind an unused key, "\C-x\C-a", + # to also enter vi-movement-mode, + # and then use that thereafter. + # (We imagine that "\C-x\C-a" is relatively unlikely to be in use.) + bind '"\C-x\C-a": vi-movement-mode' + bind '"\C-x\C-e": shell-expand-line' bind '"\C-x\C-r": redraw-current-line' bind '"\C-x^": history-expand-line' @@ -94,19 +103,19 @@ else 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"' + bind '"\C-t": "\C-x\C-a$a \C-x\C-addi$(__fzf_select_tmux__)\C-x\C-e\C-x\C-a0P$xa"' else - bind '"\C-t": "\e$a \eddi$(__fzf_select__)\C-x\C-e\e0Px$a \C-x\C-r\exa "' + bind '"\C-t": "\C-x\C-a$a \C-x\C-addi$(__fzf_select__)\C-x\C-e\C-x\C-a0Px$a \C-x\C-r\C-x\C-axa "' fi bind -m vi-command '"\C-t": "i\C-t"' # CTRL-R - Paste the selected command from history into the command line - bind '"\C-r": "\eddi$(__fzf_history__)\C-x\C-e\C-x^\e$a\C-x\C-r"' + bind '"\C-r": "\C-x\C-addi$(__fzf_history__)\C-x\C-e\C-x^\C-x\C-a$a\C-x\C-r"' bind -m vi-command '"\C-r": "i\C-r"' # ALT-C - cd into the selected directory - bind '"\ec": "\eddi$(__fzf_cd__)\C-x\C-e\C-x\C-r\C-m"' - bind -m vi-command '"\ec": "i\ec"' + bind '"\ec": "\C-x\C-addi$(__fzf_cd__)\C-x\C-e\C-x\C-r\C-m"' + bind -m vi-command '"\C-ac": "i\C-ac"' fi unset -v __use_tmux __use_tmux_auto |