From a28dbc83937cbe624ec726199b4bbe7b65b2b2a0 Mon Sep 17 00:00:00 2001
From: Matthew Hager <matthew@poeticsystems.com>
Date: Sat, 21 Feb 2015 12:33:38 -0600
Subject: Move custon *.zsh file sourcing up so that they can load plugins and
 other things that come after.

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

(limited to 'oh-my-zsh.sh')

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index bc7a8e496..71716f77f 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -29,6 +29,11 @@ for config_file ($ZSH/lib/*.zsh); do
   source $config_file
 done
 
+# Load all of your custom configurations from custom/
+for config_file ($ZSH_CUSTOM/*.zsh(N)); do
+  source $config_file
+done
+unset config_file
 
 is_plugin() {
   local base_dir=$1
@@ -72,12 +77,6 @@ for plugin ($plugins); do
   fi
 done
 
-# Load all of your custom configurations from custom/
-for config_file ($ZSH_CUSTOM/*.zsh(N)); do
-  source $config_file
-done
-unset config_file
-
 # Load the theme
 if [ "$ZSH_THEME" = "random" ]; then
   themes=($ZSH/themes/*zsh-theme)
-- 
cgit v1.2.3-70-g09d2


From 980528f9fa33780499d625bbbb8ea2cada78530d Mon Sep 17 00:00:00 2001
From: Archie <isntall@users.noreply.github.com>
Date: Sat, 23 May 2015 10:22:03 -0700
Subject: fix typo

---
 oh-my-zsh.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'oh-my-zsh.sh')

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 71716f77f..ec64c240f 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -14,7 +14,7 @@ if [[ -z "$ZSH_CUSTOM" ]]; then
     ZSH_CUSTOM="$ZSH/custom"
 fi
 
-# Set ZSH_CACHE_DIR to the path where cache files sould be created
+# Set ZSH_CACHE_DIR to the path where cache files should be created
 # or else we will use the default cache/
 if [[ -z "$ZSH_CACHE_DIR" ]]; then
   ZSH_CACHE_DIR="$ZSH/cache/"
-- 
cgit v1.2.3-70-g09d2