6ebf27b8d34c760e25749790ea78dcb0c220d76b

Author
Marc Cornellà <marc.cornella@live.com>
Committer
Marc Cornellà <marc.cornella@live.com>
Date

Message

Revert "Remove redundant bashcompinit calls"

This reverts commit f776af2a1f5d5ced17bdeb00f7adb64ccfaa99a6.

Fixes #9314

Diff

 1diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
 2index ecf78b2c2fae4df79e737ce190862f4f052877ec..7994963c323552ddd0c8ad7c2c6c65f9dc6790fd 100644
 3--- a/plugins/aws/aws.plugin.zsh
 4+++ b/plugins/aws/aws.plugin.zsh
 5@@ -64,6 +64,7 @@ fi
 6 
 7 # AWS CLI v2 comes with its own autocompletion. Check if that is there, otherwise fall back
 8 if command -v aws_completer &> /dev/null; then
 9+  autoload -Uz bashcompinit && bashcompinit
10   complete -C aws_completer aws
11 else
12   function _awscli-homebrew-installed() {
13diff --git a/plugins/compleat/compleat.plugin.zsh b/plugins/compleat/compleat.plugin.zsh
14index 247240c2075988ea1f159046fcd8eee83cedc30d..38f1b396aabf16926d6f0aff06e6f20b2840ab40 100644
15--- a/plugins/compleat/compleat.plugin.zsh
16+++ b/plugins/compleat/compleat.plugin.zsh
17@@ -10,8 +10,11 @@ if (( ${+commands[compleat]} )); then
18   local setup="${prefix}/share/compleat-1.0/compleat_setup" 
19 
20   if [[ -f "$setup" ]]; then
21+    if ! bashcompinit >/dev/null 2>&1; then
22+      autoload -U bashcompinit
23+      bashcompinit -i
24+    fi
25+
26     source "$setup" 
27   fi
28-
29-  unset prefix setup
30 fi
31diff --git a/plugins/drush/drush.plugin.zsh b/plugins/drush/drush.plugin.zsh
32index 178750c242feb93b6a424b253462a36b86fa9b24..8a20d79f268e59423771c9553ef88365ff073b81 100644
33--- a/plugins/drush/drush.plugin.zsh
34+++ b/plugins/drush/drush.plugin.zsh
35@@ -99,4 +99,6 @@ alias drvg="drush variable-get"
36 alias drvs="drush variable-set"
37 
38 # Enable drush autocomplete support
39+autoload bashcompinit
40+bashcompinit
41 source $(dirname $0)/drush.complete.sh
42diff --git a/plugins/stack/stack.plugin.zsh b/plugins/stack/stack.plugin.zsh
43index e3b6503a5ef07fa881dcc8915cbdcb6e60d52b3d..45ef3876123e32e9b36f58d98225a000931aa67f 100644
44--- a/plugins/stack/stack.plugin.zsh
45+++ b/plugins/stack/stack.plugin.zsh
46@@ -1,3 +1,4 @@
47 (( $+commands[stack] )) || return
48 
49+autoload -U +X bashcompinit && bashcompinit
50 source <(stack --bash-completion-script stack)
51diff --git a/plugins/wp-cli/wp-cli.plugin.zsh b/plugins/wp-cli/wp-cli.plugin.zsh
52index 05ecc4b8a852328f6c654fd645f23488420b68df..97bed406e997487a57e1648dd0646db35274fa1a 100644
53--- a/plugins/wp-cli/wp-cli.plugin.zsh
54+++ b/plugins/wp-cli/wp-cli.plugin.zsh
55@@ -138,6 +138,7 @@ alias wpwm='wp widget move'
56 alias wpwu='wp widget update'
57 
58 
59+autoload -U +X bashcompinit && bashcompinit
60 # bash completion for the `wp` command
61 
62 _wp_complete() {