Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/git.zsh
	themes/Soliah.zsh-theme
	themes/theunraveler.zsh-theme
This commit is contained in:
Ryan Phillips 2011-05-26 10:42:39 -05:00
commit 1e709d00e7
89 changed files with 2552 additions and 134 deletions

View file

@ -5,7 +5,7 @@ ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!"
ZSH_THEME_GIT_PROMPT_CLEAN=""
function prompt_char {
if [ "$(whoami)" = "root" ]; then echo "%{$fg[red]%}#%{$reset_color%}"; else echo $; fi
if [ $UID -eq 0 ]; then echo "%{$fg[red]%}#%{$reset_color%}"; else echo $; fi
}
PROMPT='%(?, ,%{$fg[red]%}FAIL%{$reset_color%}