From e03bd771481dfc9f9dd90326625d480163e64d46 Mon Sep 17 00:00:00 2001
From: Martin Zeman <martin.zeman@me.com>
Date: Sun, 10 Feb 2013 08:14:29 +0100
Subject: [PATCH 1/2] Changes to the way oh-my-zsh sources config scripts.
 First off, custom folder plugins now go directly into $ZSH/custom directory
 instead of $ZSH/plugin. I see no reason to have this folder in custom.
 Secondly, oh-my-zsh will now first look what scripts have been specified in
 custom. If they happen to have the same name $ZSH/lib, then they are sourced
 instead (i.e. custom files now properly override oh-my-zsh settings). I
 decided to do this so that I can have direct control over what oh-my-zsh does
 to my shell without modifying the upstream script files.

---
 oh-my-zsh.sh | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 689a79fef..bf470a9fc 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -9,18 +9,25 @@ fi
 # add a function path
 fpath=($ZSH/functions $ZSH/completions $fpath)
 
-# Load all of the config files in ~/oh-my-zsh that end in .zsh
-# TIP: Add files you don't want in git to .gitignore
-for config_file ($ZSH/lib/*.zsh); do
-  source $config_file
-done
-
 # 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
 
+# Load all of the config files in ~/oh-my-zsh/lib that end in .zsh
+# If file of the same is present in ~/oh-my-zsh/custom, source this one instead
+# TIP: Add files you don't want in git to .gitignore
+for config_file ($ZSH/lib/*.zsh); do
+  filename=$(basename "$config_file")
+  if [ -f $ZSH_CUSTOM/$filename ]; then
+    #echo "source $ZSH_CUSTOM/$filename"
+    source $ZSH_CUSTOM/$filename
+  elif [ -f $config_file ]; then
+    #echo "source $config_file"
+    source $config_file
+  fi
+done
 
 is_plugin() {
   local base_dir=$1
@@ -32,7 +39,7 @@ is_plugin() {
 # before running compinit.
 for plugin ($plugins); do
   if is_plugin $ZSH_CUSTOM $plugin; then
-    fpath=($ZSH_CUSTOM/plugins/$plugin $fpath)
+    fpath=($ZSH_CUSTOM/$plugin $fpath)
   elif is_plugin $ZSH $plugin; then
     fpath=($ZSH/plugins/$plugin $fpath)
   fi
@@ -45,18 +52,16 @@ compinit -i
 
 # Load all of the plugins that were defined in ~/.zshrc
 for plugin ($plugins); do
-  if [ -f $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh ]; then
-    source $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh
+  if [ -f $ZSH_CUSTOM/$plugin/$plugin.plugin.zsh ]; then
+    source $ZSH_CUSTOM/$plugin/$plugin.plugin.zsh
   elif [ -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(N)); do
-  source $config_file
-done
+# Unser variables
 unset config_file
+unset plugin
 
 # Load the theme
 if [ "$ZSH_THEME" = "random" ]

From 86c44f36607eb8a76da0f72ab341bc56103b4e78 Mon Sep 17 00:00:00 2001
From: Martin Zeman <martin.zeman@me.com>
Date: Sun, 10 Feb 2013 23:19:01 +0100
Subject: [PATCH 2/2] The previous implementation of oh-my-zsh.sh script would
 only source custom scripts if they happen to have the same name as scripts in
 $ZSH/lib. A second for loop will not source the remaining files as well.

---
 oh-my-zsh.sh | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index bf470a9fc..96df66c7d 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -21,13 +21,24 @@ fi
 for config_file ($ZSH/lib/*.zsh); do
   filename=$(basename "$config_file")
   if [ -f $ZSH_CUSTOM/$filename ]; then
-    #echo "source $ZSH_CUSTOM/$filename"
+    # echo "source $ZSH_CUSTOM/$filename"
     source $ZSH_CUSTOM/$filename
   elif [ -f $config_file ]; then
-    #echo "source $config_file"
+    # echo "source $config_file"
     source $config_file
   fi
 done
+unset config_file
+
+# Now source all remaining .zsh scripts in ZSH_CUSTOM
+for config_file ($ZSH_CUSTOM/*.zsh); do
+  filename=$(basename "$config_file")
+  if [ ! -f $ZSH/lib/$filename ]; then
+    # echo "source $config_file"
+    source $config_file
+  fi
+done
+unset config_file
 
 is_plugin() {
   local base_dir=$1
@@ -49,7 +60,6 @@ done
 autoload -U compinit
 compinit -i
 
-
 # Load all of the plugins that were defined in ~/.zshrc
 for plugin ($plugins); do
   if [ -f $ZSH_CUSTOM/$plugin/$plugin.plugin.zsh ]; then
@@ -58,9 +68,6 @@ for plugin ($plugins); do
     source $ZSH/plugins/$plugin/$plugin.plugin.zsh
   fi
 done
-
-# Unser variables
-unset config_file
 unset plugin
 
 # Load the theme