More debug prints converted

tcshrc

@@ -42,9 +42,7 @@ set noding
 set padhour
 
 
-if( $?CSHENV_DEBUG ) then
+_debug "TCSH Featureset probed..."
-	echo "TCSH Featureset probed..."
-endif
 
 
 #The history size for your shell can be set globally now
@@ -59,22 +57,20 @@ alias safe_source 'eval "if ( -f \!:1 ) then \\
 source \!:1 \\
 endif"'
 
-if( $?CSHENV_DEBUG ) echo "Setting up optional session sourcing mechanism."
+_debug "Setting up optional session sourcing mechanism."
 # These reload_session and `__load_session` aliases ar incredibly delicate.  They drives
 # the whole optional session mechanism -- DO NOT MESS WITH IT LIGHTLY!
 alias __load_session safe_source tcshrc.session.\$CSHENV_SESSION_PROFILE
-if( $?CSHENV_DEBUG ) echo "Setting up optional session sourcing mechanism wrapper."
+_debug "Setting up optional session sourcing mechanism wrapper."
 alias reload_session 'eval "if ( \$?CSHENV_SESSION_PROFILE ) then \\
 __load_session \\
 endif"'
 
-if( $?CSHENV_DEBUG ) echo "Setting change session alias..."
+_debug "Setting change session alias..."
 alias change_session setenv CSHENV_SESSION_PROFILE \!:1\;__load_session
 
 
-if( $?CSHENV_DEBUG ) then
+_debug "TCSH safe-source alias constructed..."
-	echo "TCSH safe-source alias constructed..."
-endif
 
 
 safe_source ${CSHENV_DIR}/tcshrc.conf
@@ -83,9 +79,7 @@ safe_source ${CSHENV_DIR}/tcshrc.conf
 # This will figure out what system we're on and setup all
 # system specific notions.  From the sourced file,
 # tcshrc.system.???? will be called
-if( $?CSHENV_DEBUG ) then
+_debug "Trying to source tcshrc.system"
-	echo "Trying to source tcshrc.system"
-endif
 source ${CSHENV_DIR}/tcshrc.system
 
 #For GNU ls(1) {From coreutils} and tcsh's color ls-F
@@ -99,30 +93,22 @@ endif
 
 setenv CLICOLOR_FORCE
 
-if( $?CSHENV_DEBUG ) then
+_debug "Trying to source tcshrc.${CSHENV_SYSTEM}"
-	echo "Trying to source tcshrc.${CSHENV_SYSTEM}"
-endif
 safe_source ${CSHENV_DIR}/tcshrc.${CSHENV_SYSTEM}
 
 # Having figured out the system, then we can load specific aliases
 
-if( $?CSHENV_DEBUG ) then
+_debug "Trying to source tcshrc.aliases"
-	echo "Trying to source tcshrc.aliases"
-endif
 source ${CSHENV_DIR}/tcshrc.aliases
 
-if( $?CSHENV_DEBUG ) then
+_debug "Trying to source tcshrc.${CSHENV_HOSTNAME}"
-	echo "Trying to source tcshrc.${CSHENV_HOSTNAME}"
-endif
 safe_source ${CSHENV_DIR}/tcshrc.${CSHENV_HOSTNAME}
 
 if( $?CSHENV_ORGANIZATION ) then
     safe_source ${CSHENV_DIR}/tcshrc.${CSHENV_ORGANIZATION}
 endif
 
-if( $?CSHENV_DEBUG ) then
+_debug "Trying to source tcshrc.bindkeys"
-	echo "Trying to source tcshrc.bindkeys"
-endif
 source ${CSHENV_DIR}/tcshrc.bindkeys
 
 set path=( ${path} /usr/sbin /sbin )
@@ -130,16 +116,14 @@ set path=( ${path} /usr/sbin /sbin )
 # TCSHRC Prompt is the LAST thing we do, since it's the entry to
 # user interface
 
-if( $?CSHENV_DEBUG ) then
+_debug "Trying to source tcshrc.prompt"
-	echo "Trying to source tcshrc.prompt"
-endif
 source ${CSHENV_DIR}/tcshrc.prompt
 
 safe_source ${CSHENV_DIR}/tcshrc.user
 
-if( $?CSHENV_DEBUG ) echo "Loading session, if one is set"
+_debug "Loading session, if one is set"
 reload_session
-if( $?CSHENV_DEBUG ) echo "Session loading done"
+_debug "Session loading done"
 
 
 ###########################

tcshrc.aliases

@@ -19,9 +19,7 @@ if( ( $?CSHENV_DEBUG ) || ( $?CSHENV_VERBOSE_STARTUP ) ) then
 endif
 
 if( $?CSHENV_USE_GNU_LS ) then
-	if( $?CSHENV_DEBUG ) then
+	_debug "Finding gls..."
-		echo "Finding gls..."
-	endif
 	if( { which gls } ) > /dev/null then
 		setenv CSHENV_SYSTEM_LS USE_GNU_LS
 	else if( "$CSHENV_SYSTEM" == "Linux" || "$CSHENV_SYSTEM" == "Cygwin" ) then
@@ -30,19 +28,13 @@ if( $?CSHENV_USE_GNU_LS ) then
 	else
 		setenv CSHENV_SYSTEM_LS $CSHENV_SYSTEM
 	endif
-	if( $?CSHENV_DEBUG ) then
+	_debug "Done with gls probe..."
-		echo "Done with gls probe..."
-	endif
 else
-	if( $?CSHENV_DEBUG ) then
+	_debug "Trying for other ls options..."
-		echo "Trying for other ls options..."
-	endif
 	if( $?CSHENV_USE_BUILTIN_LS ) then
 		setenv CSHENV_SYSTEM_LS USE_BUILTIN_LS
 	else
-		if( $?CSHENV_DEBUG ) then
+		_debug "Defaulting on ls..."
-			echo "Defaulting on ls..."
-		endif
 		setenv CSHENV_SYSTEM_LS ${CSHENV_SYSTEM}
 	endif
 endif

tcshrc.prompt.defs

@@ -2,9 +2,7 @@
 ### PROMPT DEFINITIONS ###
 ##########################
 
-if( $?CSHENV_DEBUG ) then
+_debug "Sourcing prompt setup and definitions..."
-	echo "Sourcing prompt setup and definitions..."
-endif
 
 which shuf >& /dev/null
 if( $? == 0 ) then
@@ -13,9 +11,7 @@ endif
 
 if( ! $?unknown_tty ) then
 	set unknown_tty="?"
-	if( $?CSHENV_DEBUG ) then
+	_debug "Unknown tty set..."
-		echo "Unknown tty set..."
-	endif
 endif
 
 

tcshrc.prompt.final

@@ -354,6 +354,10 @@ if( ! $?CSHENV_DISABLE_PROMPT_NESTING ) then
     endif
 endif
 
+if( ! $?CSHENV_DISABLE_PROMPT_ENV_VIEW ) then
+	set cshenv_prompt_view="%{${cshenv_prompt}%}"
+endif
+
 if( $?CSHENV_DEBUG ) then
     echo "Up to the user and host checks..."
 endif