diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-12-31 21:03:23 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-12-31 21:03:23 +0100 |
| commit | 1000565c3a2439c9a7c9759284814dbf3b8bc20d (patch) | |
| tree | 357f2fbcb81da653f6786b30175f13e3882361b7 /src | |
| parent | 2bf2417612879de627dcea1dbb22ee2199b16963 (diff) | |
| download | vim-1000565c3a2439c9a7c9759284814dbf3b8bc20d.zip | |
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)
Diffstat (limited to 'src')
| -rw-r--r-- | src/if_python.c | 5 | ||||
| -rw-r--r-- | src/if_python3.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/if_python.c b/src/if_python.c index 9d28df076..94b299e11 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 721e3cc5b..387b811f6 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 402371127..badcf25fd 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1012, +/**/ 1011, /**/ 1010, |