From 1000565c3a2439c9a7c9759284814dbf3b8bc20d Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 31 Dec 2015 21:03:23 +0100 Subject: patch 7.4.1012 Problem: Vim overwrites the value of $PYTHONHOME. Solution: Do not set $PYTHONHOME if it is already set. (Kazuki Sakamoto, closes #500) --- src/if_python.c | 5 ++++- src/if_python3.c | 5 ++++- src/version.c | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/if_python.c b/src/if_python.c index 9d28df076c..94b299e118 100644 --- a/src/if_python.c +++ b/src/if_python.c @@ -928,7 +928,10 @@ Python_Init(void) #endif #ifdef PYTHON_HOME - Py_SetPythonHome(PYTHON_HOME); +# ifdef DYNAMIC_PYTHON + if (mch_getenv((char_u *)"PYTHONHOME") == NULL) +# endif + Py_SetPythonHome(PYTHON_HOME); #endif init_structs(); diff --git a/src/if_python3.c b/src/if_python3.c index 721e3cc5bb..387b811f61 100644 --- a/src/if_python3.c +++ b/src/if_python3.c @@ -858,7 +858,10 @@ Python3_Init(void) #ifdef PYTHON3_HOME - Py_SetPythonHome(PYTHON3_HOME); +# ifdef DYNAMIC_PYTHON3 + if (mch_getenv((char_u *)"PYTHONHOME") == NULL) +# endif + Py_SetPythonHome(PYTHON3_HOME); #endif PyImport_AppendInittab("vim", Py3Init_vim); diff --git a/src/version.c b/src/version.c index 4023711279..badcf25fd3 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1012, /**/ 1011, /**/ -- cgit v1.2.3