diff options
| author | Robby Russell <robby@planetargon.com> | 2011-01-15 01:10:23 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2011-01-15 01:10:23 -0800 |
| commit | 8da8d45236f10199f41ddd8ec1d543b8cb3c0473 (patch) | |
| tree | 0d844fbfc69068b21fbdaa4a2921e862503d3e88 | |
| parent | 76d99055840a85ab4da139c1286ae7c805b88087 (diff) | |
| parent | 8294cf44d1d348fd1590ee28b5be8483fb012153 (diff) | |
| download | zsh-8da8d45236f10199f41ddd8ec1d543b8cb3c0473.tar.gz zsh-8da8d45236f10199f41ddd8ec1d543b8cb3c0473.tar.bz2 zsh-8da8d45236f10199f41ddd8ec1d543b8cb3c0473.zip | |
Merge branch 'postpone-theme-sourcing' of https://github.com/mkomitee/oh-my-zsh into mkomitee-postpone-theme-sourcing
| -rw-r--r-- | lib/appearance.zsh | 2 | ||||
| -rw-r--r-- | oh-my-zsh.sh | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/appearance.zsh b/lib/appearance.zsh index ffee52b5e..aec67721a 100644 --- a/lib/appearance.zsh +++ b/lib/appearance.zsh @@ -34,5 +34,3 @@ ZSH_THEME_GIT_PROMPT_CLEAN="" # Text to display if the branch is c # Setup the prompt with pretty colors setopt prompt_subst -# Load the theme -source "$ZSH/themes/$ZSH_THEME.zsh-theme"
\ No newline at end of file diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index 848e48eb5..291772dfe 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -14,6 +14,9 @@ for config_file ($ZSH/custom/*.zsh) source $config_file plugin=${plugin:=()} 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... if [ "$DISABLE_AUTO_UPDATE" = "true" ] then |