dot/zshrc: Hoist history settings above calling `.shell-rc'.

[profile] / dot / bashrc

diff --git a/dot/bashrc b/dot/bashrc
index f774607..9e872f5 100644 (file)
--- a/dot/bashrc
+++ b/dot/bashrc
@@ -10,9 +10,14 @@ case ${__mdw_bashrc+t} in
   t) ;;
   *) __mdw_bashrc=t
 
-## Fetch the common configuration.
+###--------------------------------------------------------------------------
+### Common shell 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,7 +77,7 @@ shopt -s extglob
 if (( ${BASH_VERSINFO[0]} >= 4 )); then shopt -s globstar; fi
 shopt -s gnu_errfmt
 shopt -s histappend
-shopt -s histexpand
+set -o histexpand
 shopt -s histreedit
 shopt -u histverify
 shopt -s hostcomplete