Merge branch 'postpone-theme-sourcing' of https://github.com/mkomitee/oh-my-zsh into mkomitee-postpone-theme-sourcing

This commit is contained in:
Robby Russell 2011-01-15 01:10:23 -08:00
commit c03f0fde77
2 changed files with 3 additions and 2 deletions

View file

@ -34,5 +34,3 @@ ZSH_THEME_GIT_PROMPT_CLEAN="" # Text to display if the branch is c
# Setup the prompt with pretty colors # Setup the prompt with pretty colors
setopt prompt_subst setopt prompt_subst
# Load the theme
source "$ZSH/themes/$ZSH_THEME.zsh-theme"

View file

@ -14,6 +14,9 @@ for config_file ($ZSH/custom/*.zsh) source $config_file
plugin=${plugin:=()} plugin=${plugin:=()}
for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
# Load the theme
source "$ZSH/themes/$ZSH_THEME.zsh-theme"
# Check for updates on initial load... # Check for updates on initial load...
if [ "$DISABLE_AUTO_UPDATE" = "true" ] if [ "$DISABLE_AUTO_UPDATE" = "true" ]
then then