summaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorJack Danger Canty <github@jackcanty.com>2015-11-03 17:52:44 -0800
committerJack Danger Canty <github@jackcanty.com>2015-11-05 10:08:54 -0800
commitc3cf3427b113514279b47349a993db51353a364a (patch)
tree126455ff5d751246345a753ed392bc4803e36ac1 /shell
parent2c4f71d85b2ac8dab1e270f0648387b9e099c2ec (diff)
Not relying on exit status for CTRL-R
In the case that fzf-tmux returns a user-selected result but with a non-zero exit status (which can happen if a function inside $PS1 returns non-zero) this allows CTRL-R to continue working as expected. Addresses #203 (Tranquility's comment)
Diffstat (limited to 'shell')
-rw-r--r--shell/key-bindings.zsh3
1 files changed, 2 insertions, 1 deletions
diff --git a/shell/key-bindings.zsh b/shell/key-bindings.zsh
index c429d918..eccc8266 100644
--- a/shell/key-bindings.zsh
+++ b/shell/key-bindings.zsh
@@ -37,7 +37,8 @@ bindkey '\ec' fzf-cd-widget
# CTRL-R - Paste the selected command from history into the command line
fzf-history-widget() {
local selected num
- if selected=( $(fc -l 1 | $(__fzfcmd) +s --tac +m -n2..,.. --tiebreak=index --toggle-sort=ctrl-r -q "$LBUFFER") ); then
+ selected=( $(fc -l 1 | $(__fzfcmd) +s --tac +m -n2..,.. --tiebreak=index --toggle-sort=ctrl-r -q "$LBUFFER") )
+ if [ -n "$selected" ]; then
num=$selected[1]
if [ -n "$num" ]; then
zle vi-fetch-history -n $num