chiark
/
gitweb
/
~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dot/bashrc, dot/zshrc: Do highlighting when `TERM' is `putty...'.
[profile]
/
dot
/
bashrc
diff --git
a/dot/bashrc
b/dot/bashrc
index 28d9bf960d72b0155e407c787883b82ea69d6a3a..990d6453e5c99ead619363289107592e96db76e8 100644
(file)
--- a/
dot/bashrc
+++ b/
dot/bashrc
@@
-6,9
+6,9
@@
__mdw_shell=bash
## Only do this if we haven't done it before. (Note that this guard isn't
## exported, so subshells will need to make their own arrangements.)
## Only do this if we haven't done it before. (Note that this guard isn't
## exported, so subshells will need to make their own arrangements.)
-case ${__mdw_
shell
rc+t} in
+case ${__mdw_
bash
rc+t} in
t) ;;
t) ;;
- *) __mdw_
shellrc=done
+ *) __mdw_
bashrc=t
## Fetch the common configuration.
. "$HOME/.shell-rc"
## Fetch the common configuration.
. "$HOME/.shell-rc"
@@
-27,7
+27,7
@@
__mdw_source_if_exists /etc/bash_completion "$HOME/.bash_completion"
__mdw_set_prompt_hacks () {
case "$TERM" in
__mdw_set_prompt_hacks () {
case "$TERM" in
- linux*|screen*|xterm*|vt100*|eterm*)
+ linux*|screen*|xterm*|
putty*|
vt100*|eterm*)
case "$(tput bold)" in
"") bold="\[$(tput md)\]" unbold="\[$(tput me)\]" ;;
*) bold="\[$(tput bold)\]" unbold="\[$(tput sgr0)\]" ;;
case "$(tput bold)" in
"") bold="\[$(tput md)\]" unbold="\[$(tput me)\]" ;;
*) bold="\[$(tput bold)\]" unbold="\[$(tput sgr0)\]" ;;
@@
-35,7
+35,8
@@
__mdw_set_prompt_hacks () {
gitcolour="\[$(tput setaf 6)\]"
rccolour="\[$(tput setaf 1)\]"
uncolour="\[$(tput op)\]"
gitcolour="\[$(tput setaf 6)\]"
rccolour="\[$(tput setaf 1)\]"
uncolour="\[$(tput op)\]"
- nl="\[
\r
\]"
+ nl="\[
+\]"
;;
esac
host='\h' dir=' \w'
;;
esac
host='\h' dir=' \w'
@@
-72,6
+73,7
@@
shopt -s extglob
if (( ${BASH_VERSINFO[0]} >= 4 )); then shopt -s globstar; fi
shopt -s gnu_errfmt
shopt -s histappend
if (( ${BASH_VERSINFO[0]} >= 4 )); then shopt -s globstar; fi
shopt -s gnu_errfmt
shopt -s histappend
+set -o histexpand
shopt -s histreedit
shopt -u histverify
shopt -s hostcomplete
shopt -s histreedit
shopt -u histverify
shopt -s hostcomplete