Merge branch 'master' into wsr

This commit is contained in:
Peter J. Holzer 2020-03-17 15:53:03 +01:00
commit 6951e5b579
2 changed files with 17 additions and 2 deletions

View File

@ -23,11 +23,26 @@ then
stty erase  stty erase 
fi fi
if [[ $TERM == xterm-256color && ! -f /usr/share/terminfo/x/xterm-256color ]] if [[ $TERM == xterm-256color && ! -f /usr/share/terminfo/x/xterm-256color && ! -f /lib/terminfo/x/xterm-256color ]]
then then
TERM=xterm TERM=xterm
fi fi
if [[ $TERM == xterm ]]
then
for t in xterm-256color
do
for dir in /usr/share/terminfo/x /lib/terminfo/x
do
if [[ -f $dir/$t ]]
then
TERM=$t
break 2
fi
done
done
fi
case "$TERM" in case "$TERM" in
xterm*|screen) xterm*|screen)
# indicated exit status by smiley (suggested by Stig Sandbeck Mathisen) # indicated exit status by smiley (suggested by Stig Sandbeck Mathisen)

2
.zshrc
View File

@ -27,7 +27,7 @@ if ack=`whence ack-grep`
then then
alias ack=$ack alias ack=$ack
fi fi
alias darkbg='xtermcontrol --bg "#000" --fg "#FFF"; export BG=dark' alias darkbg='xtermcontrol --bg "#000" --fg "#FFF --highlight="#00F""; export BG=dark'
alias lightbg='xtermcontrol --bg "#EEE" --fg "#000" --highlight="#0FF"; export BG=light' alias lightbg='xtermcontrol --bg "#EEE" --fg "#000" --highlight="#0FF"; export BG=light'
alias defaultbg='. ~/.zxtermcolors' alias defaultbg='. ~/.zxtermcolors'
alias ag='ag --color-path "34;47"' alias ag='ag --color-path "34;47"'