2208854597fe40ea501d091b39a948a854fbf3ff

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Cleaning up conflict with merge of #2330

Diff

 1diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
 2index f241efb6aaef093d8a62a3f9f5fad0b50d1bbace..3c2f456580e2c4629aa813a4bfcc303882773312 100644
 3--- a/themes/af-magic.zsh-theme
 4+++ b/themes/af-magic.zsh-theme
 5@@ -8,8 +8,6 @@
 6 # Created on:		June 19, 2012
 7 # Last modified on:	June 20, 2012
 8 
 9-
10-
11 if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
12 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
13 
14@@ -27,7 +25,12 @@ eval my_gray='$FG[237]'
15 eval my_orange='$FG[214]'
16 
17 # right prompt
18-RPROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
19+if type "virtualenv_prompt_info" > /dev/null
20+then
21+	RPROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
22+else
23+	RPROMPT='$my_gray%n@%m%{$reset_color%}%'
24+fi
25 
26 # git settings
27 ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075](branch:"