diff options
| author | Andrew Janke <andrew@apjanke.net> | 2015-09-03 13:05:24 -0400 |
|---|---|---|
| committer | Andrew Janke <andrew@apjanke.net> | 2015-09-03 13:05:24 -0400 |
| commit | 93b4a6c02eeafb875de5d9bcccd73bdcd8265f40 (patch) | |
| tree | 7cc87fcd416bf71cee77f30bf2e60cf607671f43 /oh-my-zsh.sh | |
| parent | 689b5ab3c8c8bf30ee63cafb8401d7d95e41f359 (diff) | |
| parent | 0532860c618aabc02d5dab34391b967e8e4c6272 (diff) | |
| download | zsh-93b4a6c02eeafb875de5d9bcccd73bdcd8265f40.tar.gz zsh-93b4a6c02eeafb875de5d9bcccd73bdcd8265f40.tar.bz2 zsh-93b4a6c02eeafb875de5d9bcccd73bdcd8265f40.zip | |
Merge branch 'master' into osx-fix-tab-for-iterm
Conflicts:
plugins/osx/osx.plugin.zsh
Diffstat (limited to 'oh-my-zsh.sh')
| -rw-r--r-- | oh-my-zsh.sh | 11 |
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) |