From 9dc93ae43e392d0de3cb3b2a0080c4dd29995c26 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 28 Aug 2011 16:00:19 +0200 Subject: 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. --- src/if_python.c | 3 ++- src/if_python3.c | 3 ++- src/version.c | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/if_python.c b/src/if_python.c index f3b7e5b63..d8dff02f7 100644 --- 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 023a773e2..644cf188a 100644 --- 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 7642dd6b6..f3a32154e 100644 --- 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, /**/ -- cgit v1.2.1