summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/doc/eval.txt8
-rw-r--r--src/evalfunc.c14
-rw-r--r--src/version.c2
3 files changed, 20 insertions, 4 deletions
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
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1436,
+/**/
1435,
/**/
1434,