summaryrefslogtreecommitdiff
path: root/oh-my-zsh.sh
diff options
context:
space:
mode:
authorMarc Cornellà <marc.cornella@live.com>2015-08-08 01:31:02 +0200
committerMarc Cornellà <marc.cornella@live.com>2015-08-08 01:31:02 +0200
commit3fe3ce8bdc702d7e40917bf677b0dc34211e0a55 (patch)
tree627f930c7cb80e617f6f82f2807475a91b59434b /oh-my-zsh.sh
parent3d5b3430fd9da12f6e33f534e487fe9b18928ac7 (diff)
downloadzsh-3fe3ce8bdc702d7e40917bf677b0dc34211e0a55.tar.gz
zsh-3fe3ce8bdc702d7e40917bf677b0dc34211e0a55.tar.bz2
zsh-3fe3ce8bdc702d7e40917bf677b0dc34211e0a55.zip
Revert "Move custon *.zsh file sourcing up so that they can load plugins and other things that come after."
This reverts commit a28dbc83937cbe624ec726199b4bbe7b65b2b2a0.
Diffstat (limited to 'oh-my-zsh.sh')
-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)