Merge 2babe619a3 into 1c2127727a

plugins/jj/jj.plugin.zsh

@@ -11,7 +11,7 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_jj" ]]; then
   _comps[jj]=_jj
 fi
 
-jj util completion zsh >| "$ZSH_CACHE_DIR/completions/_jj" &|
+COMPLETE=zsh jj >| "$ZSH_CACHE_DIR/completions/_jj" &|
 
 function __jj_prompt_jj() {
   local -a flags

plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh

@@ -9,9 +9,13 @@ function {
       $HOME/.local/bin/virtualenvwrapper.sh
     do
       if [[ -f "$virtualenvwrapper" ]]; then
+        if [[ $VIRTUALENVWRAPPER_NO_LAZY -eq 1 ]] && [[ $(echo $virtualenvwrapper | grep lazy) ]]; then
+          true
+        else
           source "$virtualenvwrapper"
           return
         fi
+      fi
     done
     print "[oh-my-zsh] virtualenvwrapper plugin: Cannot find virtualenvwrapper.sh.\n"\
           "Please install with \`pip install virtualenvwrapper\`" >&2