From owner-svn-src-head@FreeBSD.ORG  Wed Apr 11 14:13:22 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E7C541065678;
	Wed, 11 Apr 2012 14:13:22 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D31968FC20;
	Wed, 11 Apr 2012 14:13:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3BEDMr8081170;
	Wed, 11 Apr 2012 14:13:22 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3BEDMU4081168;
	Wed, 11 Apr 2012 14:13:22 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201204111413.q3BEDMU4081168@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 11 Apr 2012 14:13:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234133 - head/etc/root
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2012 14:13:23 -0000

Author: eadler
Date: Wed Apr 11 14:13:22 2012
New Revision: 234133
URL: http://svn.freebsd.org/changeset/base/234133

Log:
  - remove the length shortening on the path
  - make the default prompt a bit more like scp
  - make the user show as root even when using 'su' instead of 'su -'
  - the key bindings didn't hurt anything but likely hide a bug
  - merge history instead of overwriting it
  
  Submitted by:	gavin, joel
  Approved by:	cperciva

Modified:
  head/etc/root/dot.cshrc

Modified: head/etc/root/dot.cshrc
==============================================================================
--- head/etc/root/dot.cshrc	Wed Apr 11 14:12:28 2012	(r234132)
+++ head/etc/root/dot.cshrc	Wed Apr 11 14:13:22 2012	(r234133)
@@ -23,12 +23,15 @@ setenv	BLOCKSIZE	K
 
 if ($?prompt) then
 	# An interactive shell -- set some stuff up
-	set prompt = "%n@%m:%c04%# "
+	if ($uid == 0) then
+		set user = root
+	endif
+	set prompt = "%n@%m:%/ %# "
 	set promptchars = "%#"
 
 	set filec
 	set history = 1000
-	set savehist = 1000
+	set savehist = (1000 merge)
 	set autolist = ambiguous
 	# Use history to aid expansion
 	set autoexpand
@@ -38,10 +41,6 @@ if ($?prompt) then
 		bindkey "^W" backward-delete-word
 		bindkey -k up history-search-backward
 		bindkey -k down history-search-forward
-
-		bindkey "\e[1~" beginning-of-line #make Home key work;
-		bindkey "\e[3~" delete-char #make Delete key work;
-		bindkey "\e[4~" end-of-line #make End key work;
 	endif
 
 endif