From a79d080ea8409893464f69a4cba9029a6ffcb484 Mon Sep 17 00:00:00 2001
From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Fri, 3 Jul 2015 23:47:10 +0000
Subject: [PATCH] Fix g++: possible retry loop

See http://unix.stackexchange.com/q/213432/120177
---
 shell/completion.bash | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/shell/completion.bash b/shell/completion.bash
index d9e7d44..1e03b07 100644
--- a/shell/completion.bash
+++ b/shell/completion.bash
@@ -74,9 +74,10 @@ _fzf_opts_completion() {
 }
 
 _fzf_handle_dynamic_completion() {
-  local cmd orig ret
+  local cmd orig ret orig_cmd
   cmd="$1"
   shift
+  orig_cmd="$1"
 
   orig=$(eval "echo \$_fzf_orig_completion_$cmd")
   if [ -n "$orig" ] && type "$orig" > /dev/null 2>&1; then
@@ -84,7 +85,7 @@ _fzf_handle_dynamic_completion() {
   elif [ -n "$_fzf_completion_loader" ]; then
     _completion_loader "$@"
     ret=$?
-    eval $(complete | \grep "\-F.* $cmd$" | _fzf_orig_completion_filter)
+    eval $(complete | \grep "\-F.* $orig_cmd$" | _fzf_orig_completion_filter)
     source $BASH_SOURCE
     return $ret
   fi