aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

updated for version 7.3.1312

Browse Source 
Problem:    Not giving correct error messages for SystemExit().
Solution:   Move E858 into an else. (Ken Takata)
This commit is contained in:
Bram Moolenaar
2013-07-06 13:02:30 +02:00
parent bc488a76cc
commit 91aeaf4cce
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/if_py_both.h
View File

@@ -5103,14 +5103,17 @@ run_eval(const char *cmd, typval_T *rettv
run_ret = PyRun_String((char *)cmd, Py_eval_input, globals, globals); run_ret = PyRun_String((char *)cmd, Py_eval_input, globals, globals);
if (run_ret == NULL) if (run_ret == NULL)
{ {
if (PyErr_ExceptionMatches(PyExc_SystemExit)) if (PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_SystemExit))
{ {
EMSG2(_(e_py_systemexit), "python"); EMSG2(_(e_py_systemexit), "python");
PyErr_Clear(); PyErr_Clear();
} }
if (PyErr_Occurred() && !msg_silent) else
PyErr_PrintEx(0); {
EMSG(_("E858: Eval did not return a valid python object")); if (PyErr_Occurred() && !msg_silent)
PyErr_PrintEx(0);
EMSG(_("E858: Eval did not return a valid python object"));
}
} }
else else
{ {

2
src/version.c
View File

@@ -728,6 +728,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 */
/**/
1312,
/**/ /**/
1311, 1311,
/**/ /**/