* enable automatically creating the master connection

[home-base.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index a222b7ec8e6886c0d1374ad6648f1478c96b151a..602d3a810fda11412ce1b9b3588a1db788dc3d29 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -20,6 +20,10 @@ if [ "$PS1" ]; then
     fi;
     # bts debian options
 
+    if [ -e bin/faf ]; then
+       complete -F _command faf
+    fi;
+
     export DEBEMAIL="don@debian.org"
 
     # enable color support of ls and also add handy aliases
@@ -136,7 +140,12 @@ if [ "$PS1" ]; then
 
        cd ()
        {
-            builtin cd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS}
+           # use pushd instead of cd
+           if [ -z "$1" ] || [ "$1" == "-" ]; then
+               builtin cd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS};
+           else
+               builtin pushd "$@" >/dev/null && [ -r .todo ] && devtodo ${TODO_OPTIONS};
+           fi;
        }
 
        pushd ()