diff options
| author | Andrew Janke <andrew@apjanke.net> | 2015-09-19 15:07:36 -0400 |
|---|---|---|
| committer | Andrew Janke <andrew@apjanke.net> | 2015-09-19 15:07:36 -0400 |
| commit | 6cddf7202b8ef5c2eb2dfc081d870dc9e751d646 (patch) | |
| tree | be3fe162edbc04946eea014a3612280d4909dc1e /oh-my-zsh.sh | |
| parent | 82c76f6b5c2718622a532fb759231e8d24171413 (diff) | |
| parent | cbc1a0806e910f7b4eed07b992d3d88ff7cb1162 (diff) | |
| download | zsh-6cddf7202b8ef5c2eb2dfc081d870dc9e751d646.tar.gz zsh-6cddf7202b8ef5c2eb2dfc081d870dc9e751d646.tar.bz2 zsh-6cddf7202b8ef5c2eb2dfc081d870dc9e751d646.zip | |
Merge branch 'master' into installer-portable-colors
Diffstat (limited to 'oh-my-zsh.sh')
| -rw-r--r-- | oh-my-zsh.sh | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index 4e5f77990..8e31ddd0f 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -8,6 +8,9 @@ fi # add a function path fpath=($ZSH/functions $ZSH/completions $fpath) +# Load all stock functions (from $fpath files) called below. +autoload -U compaudit compinit + # Set ZSH_CUSTOM to the path where your custom config files # and plugins exists, or else we will use the default custom/ if [[ -z "$ZSH_CUSTOM" ]]; then @@ -59,9 +62,14 @@ if [ -z "$ZSH_COMPDUMP" ]; then ZSH_COMPDUMP="${ZDOTDIR:-${HOME}}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}" fi -# Load and run compinit -autoload -U compinit -compinit -i -d "${ZSH_COMPDUMP}" +# 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 # Load all of the plugins that were defined in ~/.zshrc for plugin ($plugins); do |