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)

diff --git a/src/if_python.c b/src/if_python.c
index 9d28df076cb650eec8960c7e3304af710ed1c660..94b299e1185c6b8dfa2840a4d55a0c24e88bd7af 100644 (file)
--- 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 721e3cc5bbc93e8bff8842f358a46c586def4100..387b811f613588db943bf0a5aee88dba49a30809 100644 (file)
--- 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 40237112794a16ea59e43c12292fda37f8445184..badcf25fd34b0470a6682dbdca29c52a5ae1b602 100644 (file)
--- 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,
 /**/