diff options
| author | Junegunn Choi <junegunn.c@gmail.com> | 2016-12-31 00:30:00 +0900 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2016-12-31 00:30:00 +0900 |
| commit | 73eacf11371ba8ce8c996b8569e8752637bcb633 (patch) | |
| tree | 17c95afc22411f69ebc6bed383c8616aa218e707 /shell/completion.bash | |
| parent | 7b0d9e1e077dfc271b98e24e99961619a8ea00cf (diff) | |
| download | fzf-73eacf11371ba8ce8c996b8569e8752637bcb633.tar.gz | |
[bash-completion] Always backup existing completion definitions
_fzf_completion_loaded is no longer checked. This change increases the
load time by a few milliseconds, but I can't think of a better way to
handle the issue.
Close #783.
Diffstat (limited to 'shell/completion.bash')
| -rw-r--r-- | shell/completion.bash | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/shell/completion.bash b/shell/completion.bash index 31ebc60b..fc8471b1 100644 --- a/shell/completion.bash +++ b/shell/completion.bash @@ -261,12 +261,9 @@ a_cmds=" x_cmds="kill ssh telnet unset unalias export" # Preserve existing completion -if [ "$_fzf_completion_loaded" != '0.11.3' ]; then - # Really wish I could use associative array but OSX comes with bash 3.2 :( - eval $(complete | command grep '\-F' | command grep -v _fzf_ | - command grep -E " ($(echo $d_cmds $a_cmds $x_cmds | sed 's/ /|/g' | sed 's/+/\\+/g'))$" | _fzf_orig_completion_filter) - export _fzf_completion_loaded=0.11.3 -fi +eval $(complete | + sed -E '/-F/!d; / _fzf/d; '"/ ($(echo $d_cmds $a_cmds $x_cmds | sed 's/ /|/g; s/+/\\+/g'))$/"'!d' | + _fzf_orig_completion_filter) if type _completion_loader > /dev/null 2>&1; then _fzf_completion_loader=1 |