===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/ksh.kshrc,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/etc/ksh.kshrc	2001/04/30 18:24:21	1.7
--- src/etc/ksh.kshrc	2001/11/19 03:03:33	1.8
***************
*** 1,8 ****
  :
! #	$OpenBSD: ksh.kshrc,v 1.7 2001/04/30 18:24:21 marc Exp $
  #
  # NAME:
! #	ksh.kshrc - global initialization for ksh 
  #
  # DESCRIPTION:
  #	Each invocation of /bin/ksh processes the file pointed
--- 1,8 ----
  :
! #	$OpenBSD: ksh.kshrc,v 1.8 2001/11/19 03:03:33 deraadt Exp $
  #
  # NAME:
! #	ksh.kshrc - global initialization for ksh
  #
  # DESCRIPTION:
  #	Each invocation of /bin/ksh processes the file pointed
***************
*** 26,34 ****
  #	This file is provided in the hope that it will
  #	be of use.  There is absolutely NO WARRANTY.
  #	Permission to copy, redistribute or otherwise
! #	use this file is hereby granted provided that 
  #	the above copyright notice and this notice are
! #	left intact. 
  
  case "$-" in
  *i*)	# we are interactive
--- 26,34 ----
  #	This file is provided in the hope that it will
  #	be of use.  There is absolutely NO WARRANTY.
  #	Permission to copy, redistribute or otherwise
! #	use this file is hereby granted provided that
  #	the above copyright notice and this notice are
! #	left intact.
  
  case "$-" in
  *i*)	# we are interactive
***************
*** 55,61 ****
  	tty=`tty`
  	tty=`basename $tty`
          TTY=${TTY:-$tty}
!  
  	set -o emacs
  
  	alias ls='ls -CF'
--- 55,61 ----
  	tty=`tty`
  	tty=`basename $tty`
          TTY=${TTY:-$tty}
! 
  	set -o emacs
  
  	alias ls='ls -CF'
***************
*** 153,165 ****
  		alias df='df -k'
  		alias du='du -k'
  		;;
! 	esac	
  	alias rsize='eval `resize`'
  
  	case "$TERM" in
  	sun*|xterm*)
  		case $tty in
! 		tty[p-w]*)		
  			case "$DISPLAY" in
  			"")
  				DISPLAY="`who | grep $TTY | sed -n 's/.*(\([^:)]*\)[:)].*/\1/p' | sed 's/\([a-zA-Z][^.]*\).*/\1/'`:0"
--- 153,165 ----
  		alias df='df -k'
  		alias du='du -k'
  		;;
! 	esac
  	alias rsize='eval `resize`'
  
  	case "$TERM" in
  	sun*|xterm*)
  		case $tty in
! 		tty[p-w]*)
  			case "$DISPLAY" in
  			"")
  				DISPLAY="`who | grep $TTY | sed -n 's/.*(\([^:)]*\)[:)].*/\1/p' | sed 's/\([a-zA-Z][^.]*\).*/\1/'`:0"
***************
*** 203,208 ****
  }
  # if $1 is in path, remove it
  del_path () {
!   no_path $* || eval ${2:-PATH}=`eval echo :'$'${2:-PATH}: | 
      sed -e "s;:$1:;:;g" -e "s;^:;;" -e "s;:\$;;"`
  }
--- 203,208 ----
  }
  # if $1 is in path, remove it
  del_path () {
!   no_path $* || eval ${2:-PATH}=`eval echo :'$'${2:-PATH}: |
      sed -e "s;:$1:;:;g" -e "s;^:;;" -e "s;:\$;;"`
  }