From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 28 Jan 2018 16:45:49 +0000 (+0100)
Subject: patch 8.0.1436: not enough information about what Python version may work
X-Git-Tag: v8.0.1436
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84b242c369a22b581c43de9de0152f0baedd71ab;p=vim

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
index df00dc9e4..147a7910d 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -9009,8 +9009,12 @@ persistent_undo		Compiled with support for persistent undo history.
 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
index 0300efea4..02618d7b0 100644
--- 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
 #endif
-#if defined(FEAT_PYTHON3) && !defined(DYNAMIC_PYTHON3)
+#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
index 6fe422d17..72fb66667 100644
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1436,
 /**/
     1435,
 /**/