From 3512eca2cefee9b89b08230021c25f6e30525e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ho=CC=88ltje?= <docwhat@gerf.org>
Date: Wed, 16 Nov 2011 09:25:45 -0500
Subject: [PATCH 1/2] set fpath correctly for custom plugins

Custom plugins weren't being added to the fpath correctly.
---
 oh-my-zsh.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 891e8d467..8f5e2472d 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -13,9 +13,16 @@ fpath=($ZSH/functions $ZSH/completions $fpath)
 # TIP: Add files you don't want in git to .gitignore
 for config_file ($ZSH/lib/*.zsh) source $config_file
 
-# Add all defined plugins to fpath
+# Add all defined plugins to fpath. This must be done
+# before running compinit.
 plugin=${plugin:=()}
-for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath)
+for plugin ($plugins); do
+  if [ -f $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh ]; then
+    fpath=($ZSH_CUSTOM/plugins/$plugin $fpath)
+  elif [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
+    fpath=($ZSH/plugins/$plugin $fpath)
+  fi
+done
 
 # Load and run compinit
 autoload -U compinit

From 258457ea4fe0b8fcb1f6d0242071edb82cab449a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ho=CC=88ltje?= <docwhat@gerf.org>
Date: Wed, 16 Nov 2011 09:46:05 -0500
Subject: [PATCH 2/2] Moved ZSH_CUSTOM declaration before fpath is set

* also normalized style to match the guide.
---
 oh-my-zsh.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 8f5e2472d..7ae41c33e 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -13,6 +13,12 @@ fpath=($ZSH/functions $ZSH/completions $fpath)
 # TIP: Add files you don't want in git to .gitignore
 for config_file ($ZSH/lib/*.zsh) source $config_file
 
+# Set ZSH_CUSTOM to the path where your custom config files
+# and plugins exists, or else we will use the default custom/
+if [[ -z "$ZSH_CUSTOM" ]]; then
+    ZSH_CUSTOM="$ZSH/custom"
+fi
+
 # Add all defined plugins to fpath. This must be done
 # before running compinit.
 plugin=${plugin:=()}
@@ -28,12 +34,6 @@ done
 autoload -U compinit
 compinit -i
 
-# Set ZSH_CUSTOM to the path where your custom config files
-# and plugins exists, or else we will use the default custom/
-if [ "$ZSH_CUSTOM" = ""  ]
-then
-    ZSH_CUSTOM="$ZSH/custom"
-fi
 
 # Load all of the plugins that were defined in ~/.zshrc
 for plugin ($plugins); do