Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile

* 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile:
  bash_profile: Don't force less to use latin1.
  Xdefaults: Persuade xterm to use `fixed' for Unicode output.

diff --combined Xdefaults
index 2f4bfc26887cc25e3943951c451f096d73827c4f,6d6f2e77edb38cafdf8330c29825057166243ac8..62ba871171ac87c8403dfe5a7172237c83f1e870
--- 1/Xdefaults
--- 2/Xdefaults
+++ b/Xdefaults
@@@ -2,7 -2,7 +2,7 @@@
  ! .Xdefaults
  !
  
 -#define NICEFONT -adobe-helvetica-medium-r-normal--10-*-*-p-*-iso8859-1
 +#define NICEFONT -adobe-helvetica-medium-r-normal--10-*-*-*-p-*-iso8859-1
  #define FIXED fixed
  
  ! --- General configuration ---
@@@ -38,7 -38,7 +38,7 @@@ edwin*font:           FIXE
  ! --- Special settings for xterm ---
  
  XTerm.vt100.geometry: 80x35
- XTerm.vt100.font:     FIXED
+ XTerm.vt100*font:     FIXED
  XTerm.vt100.foreground:       white
  XTerm.vt100.background:       black
  XTerm*scrollBar:      true
@@@ -62,7 -62,7 +62,7 @@@ XConsole*geometry:    485x45
  
  ! --- Emacs settings ---
  
 -emacs.geometry:               78x33
 +emacs.geometry:               77x33
  Emacs.pane.menubar.font: NICEFONT
  Emacs.menu*.font:     NICEFONT
  Emacs.font:           FIXED
@@@ -195,10 -195,10 +195,10 @@@ xzx*libDir: .:/usr/lib/xzx:/usr/local/s
  
  ! --- Axiom HyperDoc ---
  
 -Axiom.hyperdoc.RmFont: -adobe-helvetica-medium-r-normal--12-*-*-p-*-iso8859-1
 -Axiom.hyperdoc.BoldFont: -adobe-helvetica-bold-r-normal--12-*-*-p-*-iso8859-1
 -Axiom.hyperdoc.ActiveFont: -adobe-helvetica-medium-r-normal--12-*-*-p-*-iso8859-1
 -Axiom.hyperdoc.EmphasizeFont: -adobe-helvetica-medium-i-normal--12-*-*-p-*-iso8859-1
 +Axiom.hyperdoc.RmFont: -adobe-helvetica-medium-r-normal--12-*-*-*-p-*-iso8859-1
 +Axiom.hyperdoc.BoldFont: -adobe-helvetica-bold-r-normal--12-*-*-*-p-*-iso8859-1
 +Axiom.hyperdoc.ActiveFont: -adobe-helvetica-medium-r-normal--12-*-*-*-p-*-iso8859-1
 +Axiom.hyperdoc.EmphasizeFont: -adobe-helvetica-medium-i-normal--12-*-*-*-p-*-iso8859-1
  Axiom.hyperdoc.ActiveColor: blue
  Axiom.hyperdoc.AxiomFont: FIXED
  Axiom.hyperdoc.TtFont: FIXED

diff --combined bash_profile
index 466efb9deee484b2e0ef2f34529d9479d66de475,3cae439448e23ace2f3c5dfff5f19d282e687bdd..f3e1d767601003bd5399818aa3e514578a05ce1a
--- 1/bash_profile
--- 2/bash_profile
+++ b/bash_profile
@@@ -121,13 -121,7 +121,13 @@@ umask 00
  
  [ -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
  
@@@ -152,7 -146,11 +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