diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2020-10-05 17:20:02 +0200 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2020-10-05 17:20:02 +0200 |
| commit | 6ebf27b8d34c760e25749790ea78dcb0c220d76b (patch) | |
| tree | ac9259c048331b40541ea29aa04cd1d949381328 /plugins | |
| parent | fbb2b56c7ecd3c4873be805e004f70fa442e7c45 (diff) | |
| download | zsh-6ebf27b8d34c760e25749790ea78dcb0c220d76b.tar.gz zsh-6ebf27b8d34c760e25749790ea78dcb0c220d76b.tar.bz2 zsh-6ebf27b8d34c760e25749790ea78dcb0c220d76b.zip | |
Revert "Remove redundant bashcompinit calls"
This reverts commit f776af2a1f5d5ced17bdeb00f7adb64ccfaa99a6.
Fixes #9314
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/aws/aws.plugin.zsh | 1 | ||||
| -rw-r--r-- | plugins/compleat/compleat.plugin.zsh | 7 | ||||
| -rw-r--r-- | plugins/drush/drush.plugin.zsh | 2 | ||||
| -rw-r--r-- | plugins/stack/stack.plugin.zsh | 1 | ||||
| -rw-r--r-- | plugins/wp-cli/wp-cli.plugin.zsh | 1 |
5 files changed, 10 insertions, 2 deletions
diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh index ecf78b2c2..7994963c3 100644 --- a/plugins/aws/aws.plugin.zsh +++ b/plugins/aws/aws.plugin.zsh @@ -64,6 +64,7 @@ fi # AWS CLI v2 comes with its own autocompletion. Check if that is there, otherwise fall back if command -v aws_completer &> /dev/null; then + autoload -Uz bashcompinit && bashcompinit complete -C aws_completer aws else function _awscli-homebrew-installed() { diff --git a/plugins/compleat/compleat.plugin.zsh b/plugins/compleat/compleat.plugin.zsh index 247240c20..38f1b396a 100644 --- a/plugins/compleat/compleat.plugin.zsh +++ b/plugins/compleat/compleat.plugin.zsh @@ -10,8 +10,11 @@ if (( ${+commands[compleat]} )); then local setup="${prefix}/share/compleat-1.0/compleat_setup" if [[ -f "$setup" ]]; then + if ! bashcompinit >/dev/null 2>&1; then + autoload -U bashcompinit + bashcompinit -i + fi + source "$setup" fi - - unset prefix setup fi diff --git a/plugins/drush/drush.plugin.zsh b/plugins/drush/drush.plugin.zsh index 178750c24..8a20d79f2 100644 --- a/plugins/drush/drush.plugin.zsh +++ b/plugins/drush/drush.plugin.zsh @@ -99,4 +99,6 @@ alias drvg="drush variable-get" alias drvs="drush variable-set" # Enable drush autocomplete support +autoload bashcompinit +bashcompinit source $(dirname $0)/drush.complete.sh diff --git a/plugins/stack/stack.plugin.zsh b/plugins/stack/stack.plugin.zsh index e3b6503a5..45ef38761 100644 --- a/plugins/stack/stack.plugin.zsh +++ b/plugins/stack/stack.plugin.zsh @@ -1,3 +1,4 @@ (( $+commands[stack] )) || return +autoload -U +X bashcompinit && bashcompinit source <(stack --bash-completion-script stack) diff --git a/plugins/wp-cli/wp-cli.plugin.zsh b/plugins/wp-cli/wp-cli.plugin.zsh index 05ecc4b8a..97bed406e 100644 --- a/plugins/wp-cli/wp-cli.plugin.zsh +++ b/plugins/wp-cli/wp-cli.plugin.zsh @@ -138,6 +138,7 @@ alias wpwm='wp widget move' alias wpwu='wp widget update' +autoload -U +X bashcompinit && bashcompinit # bash completion for the `wp` command _wp_complete() { |