diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-08-28 16:00:19 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-08-28 16:00:19 +0200 |
| commit | 9dc93ae43e392d0de3cb3b2a0080c4dd29995c26 (patch) | |
| tree | e7f9ce8060eb9fd48ae9cfdb91c41e6dbaaf243b | |
| parent | 2eba18255ea36927ea0acc6d45b7be03ca94a139 (diff) | |
updated for version 7.3.288v7.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.
| -rw-r--r-- | src/if_python.c | 3 | ||||
| -rw-r--r-- | src/if_python3.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/if_python.c b/src/if_python.c index f3b7e5b636..d8dff02f79 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 023a773e21..644cf188aa 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 7642dd6b62..f3a32154e4 100644 --- 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, |