mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
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.
This commit is contained in:
parent
2eba18255e
commit
9dc93ae43e
@ -368,7 +368,8 @@ python_runtime_link_init(char *libname, int verbose)
|
|||||||
* standard C extension libraries of one or both python versions. */
|
* standard C extension libraries of one or both python versions. */
|
||||||
if (python3_loaded())
|
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;
|
return FAIL;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -367,7 +367,8 @@ py3_runtime_link_init(char *libname, int verbose)
|
|||||||
* standard C extension libraries of one or both python versions. */
|
* standard C extension libraries of one or both python versions. */
|
||||||
if (python_loaded())
|
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;
|
return FAIL;
|
||||||
}
|
}
|
||||||
# endif
|
# endif
|
||||||
|
@ -709,6 +709,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
288,
|
||||||
/**/
|
/**/
|
||||||
287,
|
287,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user