From 36924d0b1c7c8f01739316ed6e68c78c042e3973 Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Thu, 23 Apr 2015 22:39:07 +0900
Subject: [PATCH] [zsh] Do not change LBUFFER on empty selection (CTRL-R)

---
 shell/key-bindings.zsh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/shell/key-bindings.zsh b/shell/key-bindings.zsh
index 451e418e..17608670 100644
--- a/shell/key-bindings.zsh
+++ b/shell/key-bindings.zsh
@@ -38,13 +38,15 @@ fzf-history-widget() {
   local selected restore_no_bang_hist
   if selected=$(fc -l 1 | $(__fzfcmd) +s --tac +m -n2..,.. --tiebreak=index --toggle-sort=ctrl-r -q "$LBUFFER"); then
     num=$(echo "$selected" | head -1 | awk '{print $1}' | sed 's/[^0-9]//g')
-    LBUFFER=!$num
-    if setopt | grep nobanghist > /dev/null; then
-      restore_no_bang_hist=1
-      unsetopt no_bang_hist
+    if [ -n "$num" ]; then
+      LBUFFER=!$num
+      if setopt | grep nobanghist > /dev/null; then
+        restore_no_bang_hist=1
+        unsetopt no_bang_hist
+      fi
+      zle expand-history
+      [ -n "$restore_no_bang_hist" ] && setopt no_bang_hist
     fi
-    zle expand-history
-    [ -n "$restore_no_bang_hist" ] && setopt no_bang_hist
   fi
   zle redisplay
 }