dot/bashrc: Pull in completion magic early.

[profile] / dot / bashrc

diff --git a/dot/bashrc b/dot/bashrc
index 1b6d7af..1ed4aa0 100644 (file)
--- a/dot/bashrc
+++ b/dot/bashrc
@@ -13,6 +13,10 @@ __mdw_bashrc=done
 [ -z "$__mdw_profile" -a -r $HOME/.bash_profile ] && . $HOME/.bash_profile
 [ -r /etc/bashrc ] && . /etc/bashrc
 
+## Completion.
+[ -r /etc/bash_completion ] && . /etc/bash_completion
+[ -r $HOME/.bash_completion ] && . $HOME/.bash_completion
+
 ## Set the temporary directory again.  (If we've switched users, we'll want a
 ## different temporary directory.)
 [ "${TMPDIR+yes}" ] || eval `tmpdir -b`
@@ -117,10 +121,6 @@ alias e="$EDITOR"
 alias svn="svnwrap svn"
 alias @="ssh"
 
-## Completion.
-[ -r /etc/bash_completion ] && . /etc/bash_completion
-[ -r $HOME/.bash_completion ] && . $HOME/.bash_completion
-
 ###--------------------------------------------------------------------------
 ### Colour output.
 
@@ -157,7 +157,7 @@ alias zgrep="greplike zgrep"
 
 ## Turn off pagers inside Emacs shell buffers.
 case "$INSIDE_EMACS" in
-  22.*,comint) export PAGER=cat ;;
+  2[2-9].*,comint | [3-9][0-9].*,comint) export PAGER=cat ;;
 esac
 
 ###--------------------------------------------------------------------------