X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/5e06367fbf2f35302c42dd9d69802aa52f9391ec..18cc755108a6a909a2af1409de67ea5091a29389:/dot/bashrc?ds=inline

diff --git a/dot/bashrc b/dot/bashrc
index 28d9bf9..9e872f5 100644
--- a/dot/bashrc
+++ b/dot/bashrc
@@ -6,13 +6,18 @@ __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
+
+###--------------------------------------------------------------------------
+### Common shell configuration.
 
-## Fetch the common configuration.
 . "$HOME/.shell-rc"
 
+###--------------------------------------------------------------------------
+### Other preliminaries.
+
 ## If we've not run the main profile yet, we should do that first.  It sets
 ## up things we rely on.  Also, if there's a system script, we should run
 ## that too.
@@ -27,7 +32,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)\]" ;;
@@ -72,6 +77,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