lib/python/init.py: Call parse_and_bind for libedit and readline

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index b0ba00f8576537101d93af2989958dd7aa73aec5..1b15d83ddc834e9e9dbc94c1dab2be441c5be99f 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -160,9 +160,9 @@ if test -n "$BASH_VERSION"; then
 
    source virtualenvwrapper_lazy.sh 2>/dev/null
 
-   #if [ -n "$VIRTUAL_ENV" ]; then
-   #   . "$VIRTUAL_ENV/bin/activate"
-   #fi
+   if [ -n "$VIRTUAL_ENV" ] && ! type deactivate >/dev/null 2>&1; then
+      . "$VIRTUAL_ENV/bin/activate"
+   fi
 
 elif test -n "$KSH_VERSION" -o -n "$FCEDIT"; then
    back() { cd - "$@"; }
@@ -185,7 +185,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
    }
 
    if test -n "$BASH_VERSION"; then
-      # completion for global aliases in .gitconfig
+      # completion for aliases in global .gitconfig
 
       # fixup rbi rbia rbiap rbip - do refs name completion
       _git_fixup() { __gitcomp_nl "$(__git_refs)" ; }