X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/852cd5fbddafbfed93df4cda8ba366b14922e95d..b3468c3b536e946eedd3ad234786dec2674ff577:/bash_profile

diff --git a/bash_profile b/bash_profile
index 8c7dca6..3da56a8 100644
--- a/bash_profile
+++ b/bash_profile
@@ -59,7 +59,7 @@ __mdw_addto () {
 __mdw_conf () {
   local var=$1
   val=`sed -n "
-    /^[		]*$var[		]*=[	]*\(\|.*[^	]\)[	]*$/ {
+    /^[	 ]*$var[	 ]*=[	 ]*\(\|.*[^	 ]\)[	 ]*$/ {
       s//\1/; p; q
     }
   " ${MDWCONF-$HOME/.mdw.conf}`
@@ -80,6 +80,10 @@ if [ -d /usr/local/plan9 ]; then
     $PLAN9/bin
 fi
 
+# --- Find whether a program exists ---
+
+__mdw_programp () { type -t >/dev/null "$1"; }
+
 # --- And the same for manual pages ---
 
 case "$MACHTIME" in
@@ -98,23 +102,28 @@ export NAME="Mark Wooding"
 export EMAIL=`__mdw_conf email`
 export QMAILINJECT=c
 
+# --- Find a text editor ---
+
+export MDW_EDITOR=ed
+for ed in "emacs21 -nw" "emacs -nw" vi pico nano ae; do
+  name=`echo $ed | sed 's/ .*$//'`
+  if __mdw_programp "$name"; then
+    MDW_EDITOR=$ed
+    break
+  fi
+done
+
+export EDITOR=mdw-editor VISUAL=mdw-editor
+
 # --- Various options for programs ---
 
 umask 002
 
 [ -z "$HOST" ] && export HOST=`hostname`
 
-unset LANG
+unset LANG LC_COLLATE
 
-export EDITOR=ed
-for ed in "emacs21 -nw" "emacs -nw" vi pico nano ae; do
-  name=`echo $ed | sed 's/ .*$//'`
-  if type -t >/dev/null "$name"; then
-    EDITOR=$ed
-    break
-  fi
-done
-export VISUAL="$EDITOR"
+__mdw_programp distcc && export CCACHE_PREFIX=distcc
 
 export TEXINPUTS=".:$HOME/lib/tex//:"
 
@@ -135,7 +144,7 @@ export SVNROOT=`__mdw_conf svn-root`
 export BECOME="--preserve-environment"
 
 export PAGER=`type -p less` METAMAIL_PAGER=`type -p less`
-export LESS="-iqgRh1"
+export LESS="-iqgRh1FX"
 export LESSOPEN="|lesspipe.sh %s"
 export LESSCHARSET=latin1
 # export MAKEFLAGS="-j4"