From 6bf906a2622ddea1e9aae5d23c544d37fc4b6a76 Mon Sep 17 00:00:00 2001
From: Pat Regan <thehead@patshead.com>
Date: Tue, 12 Apr 2011 17:41:09 -0400
Subject: [PATCH] Optimize plugin loading so that only one call to compinit is
 required

---
 oh-my-zsh.sh                         | 13 +++++++++++--
 plugins/brew/brew.plugin.zsh         |  2 --
 plugins/cpanm/cpanm.plugin.zsh       |  2 --
 plugins/gem/gem.plugin.zsh           |  2 --
 plugins/github/github.plugin.zsh     |  2 --
 plugins/macports/macports.plugin.zsh |  2 --
 plugins/pip/pip.plugin.zsh           |  2 --
 plugins/vagrant/vagrant.plugin.zsh   |  1 -
 8 files changed, 11 insertions(+), 15 deletions(-)
 delete mode 100644 plugins/brew/brew.plugin.zsh
 delete mode 100644 plugins/cpanm/cpanm.plugin.zsh
 delete mode 100644 plugins/gem/gem.plugin.zsh
 delete mode 100644 plugins/github/github.plugin.zsh
 delete mode 100644 plugins/pip/pip.plugin.zsh
 delete mode 100644 plugins/vagrant/vagrant.plugin.zsh

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 84a850ca3..0c85de714 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -10,14 +10,23 @@ 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
 
-# Load all of the plugins that were defined in ~/.zshrc
+# Add all defined plugins to fpath
 plugin=${plugin:=()}
-for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
+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
+for plugin ($plugins)
+do
+  if [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]
+  then
+    source $ZSH/plugins/$plugin/$plugin.plugin.zsh
+  fi
+done
+
 # Load the theme
 source "$ZSH/themes/$ZSH_THEME.zsh-theme"
 
diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
deleted file mode 100644
index 079c0fba0..000000000
--- a/plugins/brew/brew.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# add brew completion function to path
-fpath=($ZSH/plugins/brew $fpath)
diff --git a/plugins/cpanm/cpanm.plugin.zsh b/plugins/cpanm/cpanm.plugin.zsh
deleted file mode 100644
index 8425b5ad8..000000000
--- a/plugins/cpanm/cpanm.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# add cpanm completion function to path
-fpath=($ZSH/plugins/cpanm $fpath)
diff --git a/plugins/gem/gem.plugin.zsh b/plugins/gem/gem.plugin.zsh
deleted file mode 100644
index cdfad7ad6..000000000
--- a/plugins/gem/gem.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# add gem completion function to path
-fpath=($ZSH/plugins/gem $fpath)
diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
deleted file mode 100644
index 0858783cc..000000000
--- a/plugins/github/github.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# add github completion function to path
-fpath=($ZSH/plugins/github $fpath)
diff --git a/plugins/macports/macports.plugin.zsh b/plugins/macports/macports.plugin.zsh
index 492a665b5..277352e32 100644
--- a/plugins/macports/macports.plugin.zsh
+++ b/plugins/macports/macports.plugin.zsh
@@ -6,5 +6,3 @@ alias puni="sudo port uninstall inactive"
 alias puo="sudo port upgrade outdated"
 alias pup="psu && puo"
 
-# add macports completion function to path
-fpath=($ZSH/plugins/macports $fpath)
diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
deleted file mode 100644
index 740f96207..000000000
--- a/plugins/pip/pip.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# add brew completion function to path
-fpath=($ZSH/plugins/pip $fpath)
diff --git a/plugins/vagrant/vagrant.plugin.zsh b/plugins/vagrant/vagrant.plugin.zsh
deleted file mode 100644
index 98d2d705c..000000000
--- a/plugins/vagrant/vagrant.plugin.zsh
+++ /dev/null
@@ -1 +0,0 @@
-fpath=($ZSH/plugins/vagrant $fpath)