a9c882094dedfdefb311db5967b974980cec49ec

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merge pull request #4426 from apjanke/turn-off-3889-by-default

completion: turn off the #3889 compfix check by default

Diff

 1diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
 2index 8e31ddd0ff62c43d187cd6f6fd2bf97a72a0bc11..6cc5ac63023c9d78c4799bf7a3e8a5c255049c3c 100644
 3--- a/oh-my-zsh.sh
 4+++ b/oh-my-zsh.sh
 5@@ -11,6 +11,8 @@ fpath=($ZSH/functions $ZSH/completions $fpath)
 6 # Load all stock functions (from $fpath files) called below.
 7 autoload -U compaudit compinit
 8 
 9+: ${ZSH_DISABLE_COMPFIX:=true}
10+
11 # Set ZSH_CUSTOM to the path where your custom config files
12 # and plugins exists, or else we will use the default custom/
13 if [[ -z "$ZSH_CUSTOM" ]]; then
14@@ -62,13 +64,17 @@ if [ -z "$ZSH_COMPDUMP" ]; then
15   ZSH_COMPDUMP="${ZDOTDIR:-${HOME}}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
16 fi
17 
18-# If completion insecurities exist, warn the user without enabling completions.
19-if ! compaudit &>/dev/null; then
20-  # This function resides in the "lib/compfix.zsh" script sourced above.
21-  handle_completion_insecurities
22-# Else, enable and cache completions to the desired file.
23+if [[ $ZSH_DISABLE_COMPFIX != true ]]; then
24+  # If completion insecurities exist, warn the user without enabling completions.
25+  if ! compaudit &>/dev/null; then
26+    # This function resides in the "lib/compfix.zsh" script sourced above.
27+    handle_completion_insecurities
28+  # Else, enable and cache completions to the desired file.
29+  else
30+    compinit -d "${ZSH_COMPDUMP}"
31+  fi
32 else
33-  compinit -d "${ZSH_COMPDUMP}"
34+  compinit -i -d "${ZSH_COMPDUMP}"
35 fi
36 
37 # Load all of the plugins that were defined in ~/.zshrc