X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/c24ba91075eabe1a38cd6bdafbc72c3c8f4b2747..6fc9ca849c1b9597c535885cc7c11a88c20ebd6f:/bash_profile

diff --git a/bash_profile b/bash_profile
index c290aa9..f3e1d76 100644
--- a/bash_profile
+++ b/bash_profile
@@ -104,15 +104,16 @@ export QMAILINJECT=c
 
 # --- Find a text editor ---
 
-export EDITOR=ed
-for ed in "emacs21 -nw" "emacs -nw" vi pico nano ae; do
+export MDW_EDITOR=ed
+for ed in mg "emacs22 -nw" "emacs21 -nw" "emacs -nw" vi pico nano ae; do
   name=`echo $ed | sed 's/ .*$//'`
   if __mdw_programp "$name"; then
-    EDITOR=$ed
+    MDW_EDITOR=$ed
     break
   fi
 done
-export VISUAL="$EDITOR"
+
+export EDITOR=mdw-editor VISUAL=mdw-editor
 
 # --- Various options for programs ---
 
@@ -120,7 +121,13 @@ umask 002
 
 [ -z "$HOST" ] && export HOST=`hostname`
 
-unset LANG LC_COLLATE
+if [ "$DISPLAY" = "" ]; then
+  : ${LC_CTYPE=${LANG-${LC_ALL-`__mdw_conf console-ctype`}}}
+else
+  LC_CTYPE=`__mdw_conf x-ctype`
+fi
+unset LANG LC_ALL LC_COLLATE
+export LC_CTYPE
 
 __mdw_programp distcc && export CCACHE_PREFIX=distcc
 
@@ -145,7 +152,11 @@ export BECOME="--preserve-environment"
 export PAGER=`type -p less` METAMAIL_PAGER=`type -p less`
 export LESS="-iqgRh1FX"
 export LESSOPEN="|lesspipe.sh %s"
-export LESSCHARSET=latin1
+case "$LC_CTYPE" in
+  *utf8*) LESSCHARSET=utf-8 ;;
+  *) LESSCHARSET=latin1 ;;
+esac
+export LESSCHARSET
 # export MAKEFLAGS="-j4"
 [ "$TMPDIR" ] || eval `tmpdir -b`
 export TMP=$TMPDIR