changeset 13123:aaead5b4d77d v8.0.1436

patch 8.0.1436: not enough information about what Python version may work commit https://github.com/vim/vim/commit/84b242c369a22b581c43de9de0152f0baedd71ab Author: Bram Moolenaar <Bram@vim.org> 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().
author Christian Brabandt <cb@256bit.org>
date Sun, 28 Jan 2018 18:00:06 +0100
parents 98e36d17f67d
children 49582a2e8b16
files runtime/doc/eval.txt src/evalfunc.c src/version.c
diffstat 3 files changed, 21 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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",
--- 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,