updated for version 7.3.288

Problem:    has('python') may give an error message for not being able to load
            the library after using python3.
Solution:   Only give the error when the verbose argument is true.

diff --git a/src/if_python.c b/src/if_python.c
index f3b7e5b636b2cd23dd4b8db746d52d01b7f1709d..d8dff02f794f041b40fe89b2710c10f06a8d85ed 100644 (file)
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -368,7 +368,8 @@ python_runtime_link_init(char *libname, int verbose)
      * standard C extension libraries of one or both python versions. */
     if (python3_loaded())
     {
-       EMSG(_("E836: This Vim cannot execute :python after using :py3"));
+       if (verbose)
+           EMSG(_("E836: This Vim cannot execute :python after using :py3"));
        return FAIL;
     }
 #endif

diff --git a/src/if_python3.c b/src/if_python3.c
index 023a773e21827ba4e929b2601d1365082848d58d..644cf188aa8e0e8ecd010981bf8af10c0f754e8f 100644 (file)
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -367,7 +367,8 @@ py3_runtime_link_init(char *libname, int verbose)
      * standard C extension libraries of one or both python versions. */
     if (python_loaded())
     {
-       EMSG(_("E837: This Vim cannot execute :py3 after using :python"));
+       if (verbose)
+           EMSG(_("E837: This Vim cannot execute :py3 after using :python"));
        return FAIL;
     }
 # endif

diff --git a/src/version.c b/src/version.c
index 7642dd6b62476eea38d0530d6650755daf53ba3a..f3a32154e47616c0c102e269ee754c8d7b5109e8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    288,
 /**/
     287,
 /**/