From 73eacf11371ba8ce8c996b8569e8752637bcb633 Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Sat, 31 Dec 2016 00:30:00 +0900
Subject: [PATCH] [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.
---
 shell/completion.bash | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/shell/completion.bash b/shell/completion.bash
index 31ebc60..fc8471b 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