From 235d67525198556878d2a12fce494ca2a6022e66 Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues.hiegel@qosmos.com>
Date: Fri, 10 Feb 2012 12:42:38 +0100
Subject: [Colors] updated CVS/SVN/GIT to GCL colors, with new 'merging' status

---
 12_Prompts.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to '12_Prompts.zsh')

diff --git a/12_Prompts.zsh b/12_Prompts.zsh
index 50575fa..e3087f4 100644
--- a/12_Prompts.zsh
+++ b/12_Prompts.zsh
@@ -251,7 +251,7 @@ __update_prompt_elements()
 	if [ -d CVS ]
 	then
 		CVSTAG=$(test -e CVS/Tag && cat CVS/Tag || basename $(cat CVS/Root 2>&- || echo "HEAD") )
-		CVSTAG=${CVSTAG:+ $C_$_prompt_colors[up_to_date]$_C$CVSTAG}
+		CVSTAG=${CVSTAG:+ $C_$_gcl_colors[uptodate]$_C$CVSTAG}
 	fi
 
 	# get svn status
@@ -264,7 +264,7 @@ __update_prompt_elements()
 		if [ ! -z "$CHECK_SVN_STATUS" ]
 		then
 			SVNSTATUS="$(svn diff 2>&-)"
-			SVNSTATUS=${${SVNSTATUS:+$_prompt_colors[not_up_to_date]}:-$_prompt_colors[up_to_date]}
+			SVNSTATUS=${${SVNSTATUS:+$_gcl_colors[changed]}:-$_gcl_colors[uptodate]}
 		fi
 	fi
 	SVNREV=${SVNREV:+$C_$_prompt_colors[doubledot]$_C $C_$SVNSTATUS$_C"r"$SVNREV}
@@ -328,7 +328,7 @@ __update_prompt_elements()
 	#  then we reduce the path until it reaches the last path element,
 	spaceleft=$(($spaceleft - $GITBRANCHSIZE))
 	[ $spaceleft -lt $minimalpathsize ] && spaceleft=$minimalpathsize
-	GITBRANCH=${GITBRANCH:+ $C_"$(__get_git_status)"$_C$GITBRANCH}"$(__get_guilt_series)"
+	GITBRANCH=${GITBRANCH:+ $C_"$(__get_git_status)"$_C$GITBRANCH}"$(__get_guilt_series)$C_$color[none]$_C"
 	CURDIR="$C_$_prompt_colors[path]$_C%`echo $spaceleft`<..<"$MY_PATH"%<<$C_$color[none]$_C"
 	[ "$DEBUG" = "yes" ] && echo
 }
-- 
cgit v1.2.3