summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunegunn Choi <junegunn.c@gmail.com>2016-05-29 02:11:50 +0900
committerJunegunn Choi <junegunn.c@gmail.com>2016-05-29 02:11:50 +0900
commite0b29e437be458066fca4dab39b282dfc11466f6 (patch)
tree1237f342a4b2d427d940f109fdf926276e72698d
parentbdb94fba7db3d0b59954b474439c28fb1f3fa8d8 (diff)
[bash] Use backticks to avoid delay with blink-matching-paren
Close #580
-rw-r--r--shell/key-bindings.bash6
1 files changed, 3 insertions, 3 deletions
diff --git a/shell/key-bindings.bash b/shell/key-bindings.bash
index 5ff20bb2..41e707ea 100644
--- a/shell/key-bindings.bash
+++ b/shell/key-bindings.bash
@@ -67,7 +67,7 @@ __fzf_use_tmux__() {
[ $BASH_VERSINFO -gt 3 ] && __use_bind_x=1 || __use_bind_x=0
__fzf_use_tmux__ && __use_tmux=1 || __use_tmux=0
-if [[ $'\n'$(set -o) != *$'\n'vi*on* ]]; then
+if [[ ! -o vi ]]; then
# Required to refresh the prompt after fzf
bind '"\er": redraw-current-line'
bind '"\e^": history-expand-line'
@@ -82,10 +82,10 @@ if [[ $'\n'$(set -o) != *$'\n'vi*on* ]]; then
fi
# CTRL-R - Paste the selected command from history into the command line
- bind '"\C-r": " \C-e\C-u$(__fzf_history__)\e\C-e\e^\er"'
+ bind '"\C-r": " \C-e\C-u`__fzf_history__`\e\C-e\e^\er"'
# ALT-C - cd into the selected directory
- bind '"\ec": " \C-e\C-u$(__fzf_cd__)\e\C-e\er\C-m"'
+ 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,