Llewellyn/fzf
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/fzf.git synced 2024-11-16 18:25:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #285 from evverx/possible-retry-loop

Browse Source 
[bash-completion] Fix g++: possible retry loop
This commit is contained in:
Junegunn Choi 2015-07-04 11:24:08 +09:00
commit ae72b0fb70
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
shell/completion.bash
View File

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