X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.bashrc;h=c3c0e180db0ea416df5c5b5d160e3ac8f3ee7a80;hb=bb75b38cd641550268ca4df4c9a7678d4234faee;hp=b477840ce9a51a65e29fc87dff1188068ca38bf5;hpb=13cbe300354de36fe9721e4171d294b346887209;p=cmccabe-etc

diff --git a/.bashrc b/.bashrc
index b477840..c3c0e18 100644
--- a/.bashrc
+++ b/.bashrc
@@ -5,6 +5,10 @@ if [ -f /etc/bashrc ]; then
 	. /etc/bashrc
 fi
 
+if [ -f ~/.bashrc-local ]; then
+	. ~/.bashrc-local
+fi
+
 case $- in
 *i*)
 	# interactive shell
@@ -12,8 +16,10 @@ case $- in
 	alias mv='mv -i'
 	alias vi='vim'
 	alias wget='wget --user-agent="Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)"'
-	alias which='alias | /usr/bin/which --tty-only --read-alias --show-dot --show-tilde'
+	alias grep='grep --color=tty -d skip'
 	export PATH="${PATH}:${HOME}/cmccabe-bin"
+	export EDITOR="/usr/bin/vim"
+	export CSCOPE_EDITOR="${EDITOR}"
 	;;
 *)
 	# non-interactive shell