Merge remote-tracking branch 'origin/master' into mac

2 files changed, 7 insertions, 3 deletions

diff --git a/zsh/zshenv b/zsh/.zshenv
index 3719ef4..3719ef4 100644
--- a/zsh/zshenv
+++ b/zsh/.zshenv
diff --git a/zsh/zshrc b/zsh/.zshrc
index fdd757f..45123bb 100644
--- a/zsh/zshrc
+++ b/zsh/.zshrc
@@ -68,7 +68,7 @@ zle -N zle-line-init
 zle -N zle-keymap-select
 export KEYTIMEOUT=1
 
-fpath+="$XDG_CONFIG_HOME/zsh/zfunc"
+#fpath+="$XDG_CONFIG_HOME/zsh/zfunc"
 
 autoload -Uz compinit
 
@@ -92,8 +92,12 @@ if [ -n "$ZPLUG_INSTALLED" ]; then
   zplug load
 fi
 
-autoload -Uz compinit
-compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
+autoload -Uz compinit 
+if [[ -n ${ZDOTDIR}/.zcompdump(#qN.mh+24) ]]; then
+  compinit
+else
+	compinit -C;
+fi;
 
 zstyle ':completion:*' hosts off