X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/b056f5c4e8a2217aa80dc629c7e32ad3eaa02805..93ba996def65bdebd7d7026caff9661d9b038ead:/bash_profile

diff --git a/bash_profile b/bash_profile
index 383acab..f2b0d38 100644
--- a/bash_profile
+++ b/bash_profile
@@ -1,7 +1,5 @@
 # -*-sh-*-
 #
-# $Id: .profile,v 1.3 1997/01/09 20:30:23 mdw Exp $
-#
 # Bash startup things
 #
 
@@ -92,7 +90,13 @@ export QMAILINJECT=c
 # --- Find a text editor ---
 
 export MDW_EDITOR=ed
-for ed in mg "emacs22 -nw" "emacs21 -nw" "emacs -nw" vi pico nano ae; do
+emacs_startup_args="--no-site-file --mdw-fast-startup -nw"
+for ed in \
+	"emacs22 $emacs_startup_args" \
+	"emacs21 $emacs_startup_args" \
+	mg \
+	"emacs -nw" \
+	vi pico nano ae; do
   name=`echo $ed | sed 's/ .*$//'`
   if __mdw_programp "$name"; then
     MDW_EDITOR=$ed
@@ -133,6 +137,7 @@ export BASCAT="-l +n"
 export CVS_RSH=ssh
 export CVSROOT=`mdw-conf cvs-root`
 export SVNROOT=`mdw-conf svn-root`
+export P4PORT=`mdw-conf p4-port` P4USER=`mdw-conf p4-user`
 
 export BECOME="--preserve-environment"
 
@@ -144,14 +149,25 @@ case "$LC_CTYPE" in
   *) LESSCHARSET=latin1 ;;
 esac
 export LESSCHARSET
+export NCURSES_NO_UTF8_ACS=1
 # export MAKEFLAGS="-j4"
 [ "$TMPDIR" ] || eval `tmpdir -b`
 export TMP=$TMPDIR
 export PERL_READLINE_NOWARN=yes
 
 [ -z "$NNTPSERVER" ] && export NNTPSERVER=`mdw-conf nntp-server`
-[ -z "$http_proxy" ] && export http_proxy=http://`mdw-conf http-proxy`/
-[ -z "$ftp_proxy" ] && export ftp_proxy=$http_proxy
+
+http=`mdw-conf http-proxy none`
+case "${http_proxy-none},$http" in
+  *,none) ;;
+  none,*) export http_proxy=$http ;;
+esac
+ftp=`mdw-conf ftp-proxy none`
+case "${ftp_proxy-none},$ftp,${http_proxy-none}" in
+  *,none,none) ;;
+  none,none,*) export ftp_proxy=$http_proxy ;;
+  none,*,*) export ftp_proxy=$ftp ;;
+esac
 
 export XUSERFILESEARCHPATH="$HOME/.Xapps/%N:/usr/lib/X11/%T/%N%S"