@@ -9,9 +9,6 @@ setopt always_to_end

 WORDCHARS=''

-autoload -U compinit

-compinit -i

-

 zmodload -i zsh/complist

 ## case-insensitive (all),partial-word and then substring completion

@@ -1,6 +1,4 @@

 # TODO: Explain what some of this does..

-autoload -U compinit

-compinit -i

 bindkey -e

 bindkey '\ew' kill-region

@@ -17,6 +17,10 @@ for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh

 # Load the theme

 source "$ZSH/themes/$ZSH_THEME.zsh-theme"

+# Load and run compinit

+autoload -U compinit

+compinit -i

+

 # Check for updates on initial load...

 if [ "$DISABLE_AUTO_UPDATE" = "true" ]

 then

@@ -1,4 +1,2 @@

 # add brew completion function to path

 fpath=($ZSH/plugins/brew $fpath)

-autoload -U compinit

-compinit -i

@@ -1,4 +1,2 @@

 # add cpanm completion function to path

 fpath=($ZSH/plugins/cpanm $fpath)

-autoload -U compinit

-compinit -i

@@ -1,4 +1,2 @@

 # add gem completion function to path

 fpath=($ZSH/plugins/gem $fpath)

-autoload -U compinit

-compinit -i

@@ -1,4 +1,2 @@

 # add github completion function to path

 fpath=($ZSH/plugins/github $fpath)

-autoload -U compinit

-compinit -i

@@ -8,5 +8,3 @@ alias pup="psu && puo"

 # add macports completion function to path

 fpath=($ZSH/plugins/macports $fpath)

-autoload -U compinit

-compinit -i

@@ -1,4 +1,2 @@

 # add brew completion function to path

 fpath=($ZSH/plugins/pip $fpath)

-autoload -U compinit

-compinit -i

@@ -1,3 +1 @@

 fpath=($ZSH/plugins/vagrant $fpath)

-autoload -U compinit

-compinit -i