Mercurial > vim
changeset 7416:cd69647bb839 v7.4.1012
commit https://github.com/vim/vim/commit/1000565c3a2439c9a7c9759284814dbf3b8bc20d
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Dec 31 21:03:23 2015 +0100
patch 7.4.1012
Problem: Vim overwrites the value of $PYTHONHOME.
Solution: Do not set $PYTHONHOME if it is already set. (Kazuki Sakamoto,
closes https://github.com/vim/vim/issues/500)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 31 Dec 2015 21:15:03 +0100 |
parents | 28341f2656d1 |
children | 7824fc26c578 |
files | src/if_python.c src/if_python3.c src/version.c |
diffstat | 3 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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();
--- 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);