Mercurial > vim

changeset 3032:e4f3fa1a474e v7.3.288

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bram Moolenaar <bram@vim.org>
date Sun, 28 Aug 2011 16:00:19 +0200
parents 256ce71055a9
children 614468f65736
files src/if_python.c src/if_python3.c src/version.c
diffstat 3 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -368,7 +368,8 @@ python_runtime_link_init(char *libname, 
      * 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
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -367,7 +367,8 @@ py3_runtime_link_init(char *libname, int
      * 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
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    288,
+/**/
     287,
 /**/
     286,