Merge b16cbc4153 into 3913106b2e

plugins/colorize/colorize.plugin.zsh

@@ -6,9 +6,9 @@
 alias colorize='colorize_via_pygmentize'
 
 colorize_via_pygmentize() {
-    if [ ! -x $(which pygmentize) ]; then
+    if [ ! -x $(which pygmentize | awk ' { print $(NF) } ') ]; then
         echo package \'pygmentize\' is not installed!
-        exit -1
+        return -1
     fi
 
     if [ $# -eq 0 ]; then
@@ -25,4 +25,4 @@ colorize_via_pygmentize() {
             pygmentize -g "$FNAME"
         fi
     done
-}
+}

plugins/virtualenv/virtualenv.plugin.zsh

@@ -6,3 +6,4 @@ function virtualenv_prompt_info(){
 
 # disables prompt mangling in virtual_env/bin/activate
 export VIRTUAL_ENV_DISABLE_PROMPT=1
+export VIRTUAL_ENV_DISABLE_PROMPT_BY_PLUGIN=1