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 --git a/Xdefaults b/Xdefaults
index 2f4bfc2..62ba871 100644 (file)
--- a/Xdefaults
+++ b/Xdefaults
@@ -38,7 +38,7 @@ edwin*font:           FIXED
 ! --- 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

diff --git a/bash_profile b/bash_profile
index 466efb9..f3e1d76 100644 (file)
--- a/bash_profile
+++ b/bash_profile
@@ -152,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