`2ecb17c272fa4c2ad8e41a09d8363cb5f59cd4d4`

Author: Robby Russell <robby@planetargon.com>
Committer: Robby Russell <robby@planetargon.com>
Date: 2015-08-13 04:15 UTC

Message

Merge pull request #4230 from mcornella/revert-custom-early-load

Revert commit a28dbc8 ("Move custon *.zsh file sourcing up ...")

Diff

 1diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
 2index ec64c240f0203b64b1d32fe6da2ae657e93329f1..4e5f77990dd567ca1495ed2af948473609ed1bfe 100644
 3--- a/oh-my-zsh.sh
 4+++ b/oh-my-zsh.sh
 5@@ -29,11 +29,6 @@ for config_file ($ZSH/lib/*.zsh); do
 6   source $config_file
 7 done
 8 
 9-# Load all of your custom configurations from custom/
10-for config_file ($ZSH_CUSTOM/*.zsh(N)); do
11-  source $config_file
12-done
13-unset config_file
14 
15 is_plugin() {
16   local base_dir=$1
17@@ -77,6 +72,12 @@ for plugin ($plugins); do
18   fi
19 done
20 
21+# Load all of your custom configurations from custom/
22+for config_file ($ZSH_CUSTOM/*.zsh(N)); do
23+  source $config_file
24+done
25+unset config_file
26+
27 # Load the theme
28 if [ "$ZSH_THEME" = "random" ]; then
29   themes=($ZSH/themes/*zsh-theme)