diff options
| author | Robby Russell <robby@planetargon.com> | 2014-03-08 08:02:23 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2014-03-08 08:02:23 -0800 |
| commit | 2208854597fe40ea501d091b39a948a854fbf3ff (patch) | |
| tree | c7983cd612332a8fac7875e1f9d73ab2fbe37072 | |
| parent | 6b3c9537754b4a2180648258341ae2d7ca203d1e (diff) | |
| parent | c05a28a7d9c5ca86b66b0fdf2f509e07b2a7b616 (diff) | |
| download | zsh-2208854597fe40ea501d091b39a948a854fbf3ff.tar.gz zsh-2208854597fe40ea501d091b39a948a854fbf3ff.tar.bz2 zsh-2208854597fe40ea501d091b39a948a854fbf3ff.zip | |
Cleaning up conflict with merge of #2330
| -rw-r--r-- | themes/af-magic.zsh-theme | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme index f241efb6a..3c2f45658 100644 --- a/themes/af-magic.zsh-theme +++ b/themes/af-magic.zsh-theme @@ -8,8 +8,6 @@ # Created on: June 19, 2012 # Last modified on: June 20, 2012 - - if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" @@ -27,7 +25,12 @@ eval my_gray='$FG[237]' eval my_orange='$FG[214]' # right prompt -RPROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%' +if type "virtualenv_prompt_info" > /dev/null +then + RPROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%' +else + RPROMPT='$my_gray%n@%m%{$reset_color%}%' +fi # git settings ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075](branch:" |