X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/blobdiff_plain/5e06367fbf2f35302c42dd9d69802aa52f9391ec..8a075bd77648bf73909b42db74ef010a07a725f9:/dot/bashrc

diff --git a/dot/bashrc b/dot/bashrc
index 28d9bf9..990d645 100644
--- 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.)
-case ${__mdw_shellrc+t} in
+case ${__mdw_bashrc+t} in
   t) ;;
-  *) __mdw_shellrc=done
+  *) __mdw_bashrc=t
 
 ## 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
-    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)\]" ;;
@@ -35,7 +35,8 @@ __mdw_set_prompt_hacks () {
       gitcolour="\[$(tput setaf 6)\]"
       rccolour="\[$(tput setaf 1)\]"
       uncolour="\[$(tput op)\]"
-      nl="\[
\]"
+      nl="\[
+\]"
       ;;
   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
+set -o histexpand
 shopt -s histreedit
 shopt -u histverify
 shopt -s hostcomplete