update history for previous change; fix syntax issue in previous change

Change-Id: Ia9842213c5a4fc86c9c36019f13c37c139da8965

Author: dhellmann

docs/source/history.rst

@@ -23,6 +23,10 @@ dev
   command. (:bbissue:`203`)
 - Update the tests to use a valid template for creating temporary
   directories under Linux.
+- Fix the use of ``which`` in ``virtualenvwrapper_lazy.sh`` in case it
+  is aliased.
+- Fix an issue with recursion in completion expansion crashing zsh,
+  contributed by :bbuser:`blueyed`.
 
 4.1.1
 =====

virtualenvwrapper_lazy.sh

@@ -17,11 +17,13 @@ function virtualenvwrapper_load {
     # Only source the script once.
     # We might get called multiple times, because not all of _VIRTUALENVWRAPPER_API gets
     # a real completion.
-    if [ -z $VIRTUALENVWRAPPER_LAZY_LOADED ]; then
-        if [ -n "$ZSH_VERSION" ] ; then
-            # Tried to unset any auto-load completion, does not appear to work/triggers a crash
-            # compctl + $(echo ${_VIRTUALENVWRAPPER_API})
-        fi
+    if [ -z $VIRTUALENVWRAPPER_LAZY_LOADED ]
+    then
+        # if [ -n "$ZSH_VERSION" ]
+        # then
+        #     # Tried to unset any auto-load completion, does not appear to work/triggers a crash
+        #     # compctl + $(echo ${_VIRTUALENVWRAPPER_API})
+        # fi
         source "$VIRTUALENVWRAPPER_SCRIPT"
         VIRTUALENVWRAPPER_LAZY_LOADED=1
     fi