dot/emacs: Sort the global keybindings list.

[profile] / dot / bashrc

diff --git a/dot/bashrc b/dot/bashrc
index 6d06f7eedc58f18b6c74c7e1e31e92c0a1385603..5f9742a0eb1ea76b407ef24d38da5618f054ad27 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.)
-case ${__mdw_shellrc+t} in
+case ${__mdw_bashrc+t} in
   t) ;;
-  *) __mdw_shellrc=done
+  *) __mdw_bashrc=t
 
 ## Fetch the common configuration.
 . "$HOME/.shell-rc"
@@ -22,10 +22,6 @@ __mdw_source_if_exists /etc/bashrc
 ## Completion.
 __mdw_source_if_exists /etc/bash_completion "$HOME/.bash_completion"
 
-## Set the temporary directory again.  (If we've switched users, we'll want a
-## different temporary directory.)
-case ${TMPDIR+t} in t) ;; *) eval $(tmpdir -b); esac
-
 ###--------------------------------------------------------------------------
 ### Prompt hacking.
 
@@ -76,6 +72,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