~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bash_profile: Don't call `vt-is-UTF8' on a pty.
[profile]
/
bash_profile
diff --git
a/bash_profile
b/bash_profile
index
a7c69f7
..
08e4e13
100644
(file)
--- a/
bash_profile
+++ b/
bash_profile
@@
-94,7
+94,7
@@
emacs_startup_args="--no-site-file --mdw-fast-startup -nw"
for ed in \
"emacs22 $emacs_startup_args" \
"emacs21 $emacs_startup_args" \
for ed in \
"emacs22 $emacs_startup_args" \
"emacs21 $emacs_startup_args" \
- mg \
+
zile
mg \
"emacs -nw" \
vi pico nano ae; do
name=`echo $ed | sed 's/ .*$//'`
"emacs -nw" \
vi pico nano ae; do
name=`echo $ed | sed 's/ .*$//'`
@@
-112,19
+112,33
@@
umask 002
[ -z "$HOST" ] && export HOST=`hostname`
[ -z "$HOST" ] && export HOST=`hostname`
-if [ "$DISPLAY" = "" ]; then
- : ${LC_CTYPE=${LANG-${LC_ALL-`mdw-conf console-ctype`}}}
+if [ "$DISPLAY"
!
= "" ]; then
+ LANG=`mdw-conf x-ctype`
else
else
- LC_CTYPE=`mdw-conf x-ctype`
+ : ${LANG=${LC_CTYPE-${LC_ALL-`mdw-conf console-ctype`}}}
+ case "$TERM,`tty`" in
+ linux,/dev/tty*)
+ if vt-is-UTF8 >/dev/null 2>&1; then
+ ctype=.utf8
+ else
+ ctype=
+ fi
+ LANG=${LANG%.*}$ctype
+ ;;
+ esac
fi
fi
-unset L
ANG LC_ALL LC_COLLATE
-export LC_C
TYPE
+unset L
C_ALL
+export LC_C
OLLATE=POSIX LANG
__mdw_programp distcc && export CCACHE_PREFIX=distcc
export TEXINPUTS=".:$HOME/lib/tex//:"
__mdw_programp distcc && export CCACHE_PREFIX=distcc
export TEXINPUTS=".:$HOME/lib/tex//:"
-__mdw_addto INFOPATH r $HOME/info /usr/info /usr/share/info /usr/local/info
+__mdw_addto INFOPATH r \
+ $HOME/info \
+ /usr/info /usr/share/info \
+ /usr/local/info /usr/local/share/info \
+ /usr/local/share/info/its
__mdw_addto PERLLIB r $HOME/lib/perl
__mdw_addto PYTHONPATH r $HOME/lib/python
__mdw_addto PERLLIB r $HOME/lib/perl
__mdw_addto PYTHONPATH r $HOME/lib/python
@@
-144,8
+158,8
@@
export BECOME="--preserve-environment"
export PAGER=`type -p less` METAMAIL_PAGER=`type -p less`
export LESS="-iqgRh1FX"
export LESSOPEN="|lesspipe.sh %s"
export PAGER=`type -p less` METAMAIL_PAGER=`type -p less`
export LESS="-iqgRh1FX"
export LESSOPEN="|lesspipe.sh %s"
-case "$
LC_CTYPE
" in
- *utf8
*
) LESSCHARSET=utf-8 ;;
+case "$
{LC_CTYPE-$LANG}
" in
+ *utf8
| *utf-8 | *UTF8 | *UTF-8
) LESSCHARSET=utf-8 ;;
*) LESSCHARSET=latin1 ;;
esac
export LESSCHARSET
*) LESSCHARSET=latin1 ;;
esac
export LESSCHARSET