From 4c31107e3b21e399790b2577efab0ef537b2ecc4 Mon Sep 17 00:00:00 2001
From: Kaleb Elwert <belak@coded.io>
Date: Thu, 14 Dec 2017 17:11:03 -0800
Subject: [PATCH] python: only override virtualenv python if not set

Fixes #1520
---
 modules/autosuggestions/external |  2 +-
 modules/python/init.zsh          | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/modules/autosuggestions/external b/modules/autosuggestions/external
index 15931f0..9f9237a 160000
--- a/modules/autosuggestions/external
+++ b/modules/autosuggestions/external
@@ -1 +1 @@
-Subproject commit 15931f04ffac91a2f9a1a044b6b3ee4050751064
+Subproject commit 9f9237ab8a530eeff389161202bbc7283ad6af3e
diff --git a/modules/python/init.zsh b/modules/python/init.zsh
index 68c8c89..5e4b79b 100644
--- a/modules/python/init.zsh
+++ b/modules/python/init.zsh
@@ -116,16 +116,19 @@ if (( $+VIRTUALENVWRAPPER_VIRTUALENV || $+commands[virtualenv] )) && \
     # in '$path' or in an alternative location on a Debian based system.
     #
     # If the python-path was manually specified, use that. Otherwise, if
-    # homebrew is installed we fall back to python3 then python2 in that
-    # order. This is needed to fix an issue with virtualenvwrapper as homebrew
-    # no longer shadows the system python.
+    # homebrew is installed and it wasn't overridden via environment variable
+    # we fall back to python3 then python2 in that order. This is needed to
+    # fix an issue with virtualenvwrapper as homebrew no longer shadows the
+    # system python.
     zstyle -s ':prezto:module:python:virtualenvwrapper' python-path '_venv_python'
     if [[ -n "$_venv_python" ]]; then
       export VIRTUALENVWRAPPER_PYTHON=$_venv_python
-    elif (( $+commands[brew] )) && (( $+commands[python3] )); then
-      export VIRTUALENVWRAPPER_PYTHON=$commands[python3]
-    elif (( $+commands[brew] )) && (( $+commands[python2] )); then
-      export VIRTUALENVWRAPPER_PYTHON=$commands[python2]
+    elif [[ -z "$VIRTUALENVWRAPPER_PYTHON" ]] && (( $+commands[brew] )); then
+      if (( $+commands[python3] )); then
+        export VIRTUALENVWRAPPER_PYTHON=$commands[python3]
+      elif (( $+commands[python2] )); then
+        export VIRTUALENVWRAPPER_PYTHON=$commands[python2]
+      fi
     fi
 
     virtenv_sources=(