diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2018-05-26 21:35:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-26 21:35:39 +0200 |
| commit | 62f676116e2f623329aaead72bfed5b4d2faa17f (patch) | |
| tree | fbaaf92186196b6434ddbdade7b8f54573fea528 /oh-my-zsh.sh | |
| parent | 90a5bd06ca76aff04f76a5d43a432ed9340dd78d (diff) | |
| parent | b91659951e15c288c8b9d6b947dfde9c6dceae22 (diff) | |
| download | zsh-62f676116e2f623329aaead72bfed5b4d2faa17f.tar.gz zsh-62f676116e2f623329aaead72bfed5b4d2faa17f.tar.bz2 zsh-62f676116e2f623329aaead72bfed5b4d2faa17f.zip | |
Merge pull request #6863 from robbyrussell/fix-compfix-loading
compfix: better error message and loading of completions
Diffstat (limited to 'oh-my-zsh.sh')
| -rw-r--r-- | oh-my-zsh.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index c0e2ba8f6..72527362f 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -63,15 +63,14 @@ if [ -z "$ZSH_COMPDUMP" ]; then fi if [[ $ZSH_DISABLE_COMPFIX != true ]]; then - # If completion insecurities exist, warn the user without enabling completions. + # If completion insecurities exist, warn the user 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 only from secure directories + compinit -i -d "${ZSH_COMPDUMP}" else + # If the user wants it, load from all found directories compinit -u -d "${ZSH_COMPDUMP}" fi |