mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-12-23 12:51:58 +00:00
Merge pull request #4426 from apjanke/turn-off-3889-by-default
completion: turn off the #3889 compfix check by default
This commit is contained in:
commit
a9c882094d
1 changed files with 12 additions and 6 deletions
18
oh-my-zsh.sh
18
oh-my-zsh.sh
|
@ -11,6 +11,8 @@ fpath=($ZSH/functions $ZSH/completions $fpath)
|
||||||
# Load all stock functions (from $fpath files) called below.
|
# Load all stock functions (from $fpath files) called below.
|
||||||
autoload -U compaudit compinit
|
autoload -U compaudit compinit
|
||||||
|
|
||||||
|
: ${ZSH_DISABLE_COMPFIX:=true}
|
||||||
|
|
||||||
# Set ZSH_CUSTOM to the path where your custom config files
|
# Set ZSH_CUSTOM to the path where your custom config files
|
||||||
# and plugins exists, or else we will use the default custom/
|
# and plugins exists, or else we will use the default custom/
|
||||||
if [[ -z "$ZSH_CUSTOM" ]]; then
|
if [[ -z "$ZSH_CUSTOM" ]]; then
|
||||||
|
@ -62,13 +64,17 @@ if [ -z "$ZSH_COMPDUMP" ]; then
|
||||||
ZSH_COMPDUMP="${ZDOTDIR:-${HOME}}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
|
ZSH_COMPDUMP="${ZDOTDIR:-${HOME}}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# If completion insecurities exist, warn the user without enabling completions.
|
if [[ $ZSH_DISABLE_COMPFIX != true ]]; then
|
||||||
if ! compaudit &>/dev/null; then
|
# If completion insecurities exist, warn the user without enabling completions.
|
||||||
# This function resides in the "lib/compfix.zsh" script sourced above.
|
if ! compaudit &>/dev/null; then
|
||||||
handle_completion_insecurities
|
# This function resides in the "lib/compfix.zsh" script sourced above.
|
||||||
# Else, enable and cache completions to the desired file.
|
handle_completion_insecurities
|
||||||
|
# Else, enable and cache completions to the desired file.
|
||||||
|
else
|
||||||
|
compinit -d "${ZSH_COMPDUMP}"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
compinit -d "${ZSH_COMPDUMP}"
|
compinit -i -d "${ZSH_COMPDUMP}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Load all of the plugins that were defined in ~/.zshrc
|
# Load all of the plugins that were defined in ~/.zshrc
|
||||||
|
|
Loading…
Reference in a new issue