`8da8d45236f10199f41ddd8ec1d543b8cb3c0473`

Author: Robby Russell <robby@planetargon.com>
Committer: Robby Russell <robby@planetargon.com>
Date: 2011-01-15 09:10 UTC

Message

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

Diff

 1diff --git a/lib/appearance.zsh b/lib/appearance.zsh
 2index ffee52b5e50a6e354d1adb5d94d877fe7ea3cb57..aec67721a8414ba3386b4d2a9f87306235e3eb16 100644
 3--- a/lib/appearance.zsh
 4+++ b/lib/appearance.zsh
 5@@ -34,5 +34,3 @@ ZSH_THEME_GIT_PROMPT_CLEAN=""               # Text to display if the branch is c
 6 # Setup the prompt with pretty colors
 7 setopt prompt_subst
 8 
 9-# Load the theme
10-source "$ZSH/themes/$ZSH_THEME.zsh-theme"
11diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
12index 848e48eb5e7002391a4a352c8bd7828a09023998..291772dfe0b8bc5345717ef2b185eb7b52fa3194 100644
13--- a/oh-my-zsh.sh
14+++ b/oh-my-zsh.sh
15@@ -14,6 +14,9 @@ for config_file ($ZSH/custom/*.zsh) source $config_file
16 plugin=${plugin:=()}
17 for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
18 
19+# Load the theme
20+source "$ZSH/themes/$ZSH_THEME.zsh-theme"
21+
22 # Check for updates on initial load...
23 if [ "$DISABLE_AUTO_UPDATE" = "true" ]
24 then