hjp
/
dot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into wsr_shared

This commit is contained in:
Peter J. Holzer 2019-09-08 12:22:11 +02:00
parent 90e126ab82 9c62e51afc
commit 97e047b05f
2 changed files with 5 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.vimrc
View File

@ -38,3 +38,7 @@ map!  >I<yypa/O
autocmd FileType perl let perl_fold=1
autocmd FileType perl let perl_fold_blocks=1
autocmd FileType perl syntax on
autocmd FileType go set sw=8
autocmd FileType go set tw=79
autocmd FileType go set noexpandtab

39
.zshrc
View File

@ -30,7 +30,7 @@ fi
alias darkbg='xtermcontrol --bg "#000" --fg "#FFF"; export BG=dark'
alias lightbg='xtermcontrol --bg "#EEE" --fg "#000" --highlight="#0FF"; export BG=light'
alias defaultbg='. ~/.zxtermcolors'
alias ag='ag --color-path 32'
alias ag='ag --color-path "34;47"'
namedir(){
eval "$1=~+"
@ -127,40 +127,3 @@ fi
# for new style completion:
autoload -U compinit
compinit
utf=`locale -a | grep en_US.utf8`
if [ -n "$utf" ]
then
# this is a bit of a hack -
# locale -a advertises the locale as "en_US.utf8",
# but the glibc accepts both "en_US.utf8" and
# "en_US.UTF-8" and xterm recogizes only the latter.
# So we explicitely set the latter, even though that's
# not the canonical name and may break some day.
#
case "`uname -sr`" in
Linux*)
LANG=en_US.UTF-8
;;
HP-UX*)
# UTF-8 locale on HP-UX is broken
LANG=en_US.iso88591
;;
*)
LANG=en_US.utf8
;;
esac
else
# fall back to latin 1.
LANG=en_US.iso88591
fi
export LANG
case "$LANG" in
*.iso88591)
export LESSCHARSET=latin1
export NLS_LANG=american_america.WE8ISO8859P1
;;
*.UTF-8)
export NLS_LANG=american_america.UTF8
;;
esac