summaryrefslogtreecommitdiff
path: root/oh-my-zsh.sh
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2011-04-28 23:24:39 -0700
committerRobby Russell <robby@planetargon.com>2011-04-28 23:24:39 -0700
commitc550f1f8443774e9639bbb03b50728eb855836eb (patch)
treed7b913504d5e30d68527487be44564ad8f487e98 /oh-my-zsh.sh
parent70d0beae22e7d97d4380af32dae1618f45e3dd4b (diff)
parent58a7cf19b7af136c5f59ee706ffe4772871f00fa (diff)
downloadzsh-c550f1f8443774e9639bbb03b50728eb855836eb.tar.gz
zsh-c550f1f8443774e9639bbb03b50728eb855836eb.tar.bz2
zsh-c550f1f8443774e9639bbb03b50728eb855836eb.zip
Merged pull request #269 from oknowton/master.
Significantly speed up startup time (1.2 seconds for me) by removing redundant compinit calls
Diffstat (limited to 'oh-my-zsh.sh')
-rw-r--r--oh-my-zsh.sh19
1 files changed, 15 insertions, 4 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 291772dfe..bf108afce 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -7,12 +7,23 @@ fpath=($ZSH/functions $fpath)
# TIP: Add files you don't want in git to .gitignore
for config_file ($ZSH/lib/*.zsh) source $config_file
-# Load all of your custom configurations from custom/
-for config_file ($ZSH/custom/*.zsh) source $config_file
+# Add all defined plugins to fpath
+plugin=${plugin:=()}
+for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath)
+
+# Load and run compinit
+autoload -U compinit
+compinit -i
# Load all of the plugins that were defined in ~/.zshrc
-plugin=${plugin:=()}
-for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
+for plugin ($plugins); do
+ if [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
+ source $ZSH/plugins/$plugin/$plugin.plugin.zsh
+ fi
+done
+
+# Load all of your custom configurations from custom/
+for config_file ($ZSH/custom/*.zsh) source $config_file
# Load the theme
source "$ZSH/themes/$ZSH_THEME.zsh-theme"