X-Git-Url: http://www.git.stargrave.org/?p=zsh-autoenv.git;a=blobdiff_plain;f=README.md;fp=README.md;h=c0036cef2da23337006c4ac3b1107435ef360c29;hp=fe81fe643195e6e6f088ecb38a6ce9e56cf14d66;hb=e9809c1bd28496e025ca05576f574e08e93e12e8;hpb=c60241f9d9ad906f083713ee185e8bd8a2b69d6e

diff --git a/README.md b/README.md
index fe81fe6..c0036ce 100644
--- a/README.md
+++ b/README.md
@@ -191,20 +191,31 @@ if [[ $autoenv_event == 'enter' ]]; then
 
     setopt localoptions extendedglob
     local -a venv
-    venv=(./(../)#.venv(NY1:a))
+    venv=(./(../)#.venv(NY1:A))
 
     if [[ -n "$_ZSH_ACTIVATED_VIRTUALENV" && -n "$VIRTUAL_ENV" ]]; then
       if ! (( $#venv )) || [[ "$_ZSH_ACTIVATED_VIRTUALENV" != "$venv[1]" ]]; then
         unset _ZSH_ACTIVATED_VIRTUALENV
         echo "De-activating virtualenv: ${(D)VIRTUAL_ENV}" >&2
-        deactivate
+
+        # Simulate "deactivate", but handle $PATH better (remove VIRTUAL_ENV).
+        if ! autoenv_remove_path $VIRTUAL_ENV/bin; then
+          echo "warning: ${VIRTUAL_ENV}/bin not found in \$PATH" >&2
+        fi
+
+        # NOTE: does not handle PYTHONHOME/_OLD_VIRTUAL_PYTHONHOME
+        unset _OLD_VIRTUAL_PYTHONHOME
+        # NOTE: does not handle PS1/_OLD_VIRTUAL_PS1
+        unset _OLD_VIRTUAL_PS1
+        unset VIRTUAL_ENV
       fi
     fi
 
     if [[ -z "$VIRTUAL_ENV" ]]; then
       if (( $#venv )); then
         echo "Activating virtualenv: ${(D)venv}" >&2
-        source $venv[1]/bin/activate
+        export VIRTUAL_ENV=$venv[1]
+        autoenv_prepend_path $VIRTUAL_ENV/bin
         _ZSH_ACTIVATED_VIRTUALENV="$venv[1]"
       fi
     fi