# HG changeset patch # User Christian Brabandt # Date 1517158806 -3600 # Node ID aaead5b4d77d2a5cfc20de670b6be2fe4de4d0dd # Parent 98e36d17f67df0e3ba878178a233855d51234662 patch 8.0.1436: not enough information about what Python version may work commit https://github.com/vim/vim/commit/84b242c369a22b581c43de9de0152f0baedd71ab Author: Bram Moolenaar Date: Sun Jan 28 17:45:49 2018 +0100 patch 8.0.1436: not enough information about what Python version may work Problem: Not enough information about what Python version may work. Solution: Add "python_compiled", "python3_compiled", "python_dynamic" and "python3_dynamic" values for has(). diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -9009,8 +9009,12 @@ persistent_undo Compiled with support f postscript Compiled with PostScript file printing. printer Compiled with |:hardcopy| support. profile Compiled with |:profile| support. -python Compiled with Python 2.x interface. |has-python| -python3 Compiled with Python 3.x interface. |has-python| +python Python 2.x interface available. |has-python| +python_compiled Compiled with Python 2.x interface. |has-python| +python_dynamic Python 2.x interface is dynamically loaded. |has-python| +python3 Python 3.x interface available. |has-python| +python3_compiled Compiled with Python 3.x interface. |has-python| +python3_dynamic Python 3.x interface is dynamically loaded. |has-python| pythonx Compiled with |python_x| interface. |has-pythonx| qnx QNX version of Vim. quickfix Compiled with |quickfix| support. diff --git a/src/evalfunc.c b/src/evalfunc.c --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -5916,13 +5916,23 @@ f_has(typval_T *argvars, typval_T *rettv #ifdef FEAT_PERSISTENT_UNDO "persistent_undo", #endif -#if defined(FEAT_PYTHON) && !defined(DYNAMIC_PYTHON) +#if defined(FEAT_PYTHON) + "python_compiled", +# if defined(DYNAMIC_PYTHON) + "python_dynamic", +# else "python", "pythonx", -#endif -#if defined(FEAT_PYTHON3) && !defined(DYNAMIC_PYTHON3) +# endif +#endif +#if defined(FEAT_PYTHON3) + "python3_compiled", +# if defined(DYNAMIC_PYTHON3) + "python3_dynamic", +# else "python3", "pythonx", +# endif #endif #ifdef FEAT_POSTSCRIPT "postscript", diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1436, +/**/ 1435, /**/ 1434,