1 files changed, 11 insertions, 8 deletions
diff --git a/etc/shrc b/etc/shrc
index 77f2ec2..9a4b012 100644
--- a/etc/shrc
+++ b/etc/shrc
@@ -5,15 +5,18 @@
 ll(){ ls -lp ${1+"$@"}; }
 
 case "$-" in *i*)
-	if /bin/test -z "${HOST}"; then
-		HOST="$(hostname)"
-	fi
-	/bin/test "$(whoami)" = root && PS1='# ' || PS1='$ '
-	case "$0,$TERM" in
-	*ksh,xterm*)	PS1='
-]2;$PWD'${HOST%%.*}$PS1 ;;
-	*)		PS1=${HOST%%.*}$PS1 ;;
-	esac
 	set -o emacs
+
+	# configure prompt
+	case "$0,$TERM,$XTERM_SHELL" in
+	*ksh,screen,/*)	PS1='
+P]2;$PWD\\' ;;
+	*ksh,*,/*)	PS1='
+]0;$PWD' ;;
+	*)		PS1= ;;
+	esac
+	/bin/test -z "${HOST}" && HOST="$(hostname)"
+	PS1=$PS1${HOST%%.*}
+	/bin/test "$(whoami)" = root && PS1=$PS1'# ' || PS1=$PS1'$ '
+
 	# This file is used by shells that might not support
 	# set -o tabcomplete, so check before trying to use it.
 	( set -o tabcomplete 2>/dev/null ) && set -o tabcomplete