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

@ -1,4 +1,4 @@
if [ "$(whoami)" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi
if [ $UID -eq 0 ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi
local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"