diff options
| author | Junegunn Choi <junegunn.c@gmail.com> | 2013-11-23 20:16:46 +0900 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2013-11-23 20:16:46 +0900 |
| commit | 89ae45cda4fbf0b56abe0c568275a98fc5f51231 (patch) | |
| tree | f814267007d5321921cc9b43f04e85cdab966b3e /fzf-completion.bash | |
| parent | f660ad35b2a28fd21778ba0a80e880e27ab32a9b (diff) | |
| parent | a79760425553d76e662d4f1b2f03b6a1f851b02e (diff) | |
| download | fzf-89ae45cda4fbf0b56abe0c568275a98fc5f51231.tar.gz | |
Merge branch 'master' of github.com:junegunn/fzf
Conflicts:
fzf-completion.bash
Diffstat (limited to 'fzf-completion.bash')
| -rw-r--r-- | fzf-completion.bash | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fzf-completion.bash b/fzf-completion.bash index bdb8568e..78d7e1d1 100644 --- a/fzf-completion.bash +++ b/fzf-completion.bash @@ -56,9 +56,10 @@ _fzf_generic_completion() { matches=${matches% } if [ -n "$matches" ]; then COMPREPLY=( "$matches" ) - return 0 + else + COMPREPLY=( "$cur" ) fi - return 1 + return 0 fi dir=$(dirname "$dir") done @@ -87,7 +88,7 @@ complete -F _fzf_opts_completion fzf # Directory for cmd in "cd pushd rmdir"; do - complete -F _fzf_dir_completion -o default $cmd + complete -F _fzf_dir_completion -o default -o bashdefault $cmd done # File @@ -96,7 +97,7 @@ for cmd in " emacs ex file ftp g++ gcc gvim head hg java javac ld less more mvim patch perl python ruby sed sftp sort source tail tee uniq vi view vim wc"; do - complete -F _fzf_file_completion -o default $cmd + complete -F _fzf_file_completion -o default -o bashdefault $cmd done # Anything @@ -105,7 +106,7 @@ for cmd in " find git grep gunzip gzip hg jar ln ls mv open rm rsync scp svn tar unzip zip"; do - complete -F _fzf_all_completion -o default $cmd + complete -F _fzf_all_completion -o default -o bashdefault $cmd done bind '"\e\e": complete' |