From ed4948ef68a31653af31e6d51a9e5e47cab0272b Mon Sep 17 00:00:00 2001 From: Marco Farrugia Date: Sun, 18 Oct 2015 17:15:06 -0400 Subject: [PATCH] Add variable ZSH_DISABLE_COMPINIT. When set to true, stops omzsh from invoking compinit. Particularly useful when Omzsh is being used as a plugin by zgen, antigen, etc. --- oh-my-zsh.sh | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index 6cc5ac630..e3e376391 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -64,19 +64,21 @@ if [ -z "$ZSH_COMPDUMP" ]; then ZSH_COMPDUMP="${ZDOTDIR:-${HOME}}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}" fi -if [[ $ZSH_DISABLE_COMPFIX != true ]]; then - # If completion insecurities exist, warn the user without enabling completions. - if ! compaudit &>/dev/null; then - # This function resides in the "lib/compfix.zsh" script sourced above. - handle_completion_insecurities - # Else, enable and cache completions to the desired file. - else - compinit -d "${ZSH_COMPDUMP}" - fi -else - compinit -i -d "${ZSH_COMPDUMP}" -fi +if [[ $ZSH_DISABLE_COMPINIT != true ]]; then + if [[ $ZSH_DISABLE_COMPFIX != true ]]; then + # If completion insecurities exist, warn the user without enabling completions. + if ! compaudit &>/dev/null; then + # This function resides in the "lib/compfix.zsh" script sourced above. + handle_completion_insecurities + # Else, enable and cache completions to the desired file. + else + compinit -d "${ZSH_COMPDUMP}" + fi + else + compinit -i -d "${ZSH_COMPDUMP}" + fi +fi # Load all of the plugins that were defined in ~/.zshrc for plugin ($plugins); do if [ -f $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh ]; then