summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2015-08-12 21:15:23 -0700
committerRobby Russell <robby@planetargon.com>2015-08-12 21:15:23 -0700
commit2ecb17c272fa4c2ad8e41a09d8363cb5f59cd4d4 (patch)
treebb04514da51893d3007e90b8972a88db0b6570b4
parent20f536c06432a5cda86fc9b5bdf73fd1115cb84d (diff)
parent3fe3ce8bdc702d7e40917bf677b0dc34211e0a55 (diff)
downloadzsh-2ecb17c272fa4c2ad8e41a09d8363cb5f59cd4d4.tar.gz
zsh-2ecb17c272fa4c2ad8e41a09d8363cb5f59cd4d4.tar.bz2
zsh-2ecb17c272fa4c2ad8e41a09d8363cb5f59cd4d4.zip
Merge pull request #4230 from mcornella/revert-custom-early-load
Revert commit a28dbc8 ("Move custon *.zsh file sourcing up ...")
-rw-r--r--oh-my-zsh.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index ec64c240f..4e5f77990 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -29,11 +29,6 @@ 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
@@ -77,6 +72,12 @@ 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)