updated for version 7.3.1312

Problem:    Not giving correct error messages for SystemExit().
Solution:   Move E858 into an else. (Ken Takata)

diff --git a/src/if_py_both.h b/src/if_py_both.h
index 7253fc72c49a4351b76715a20d3c043415a91997..a9fe505a8b18828f87f37dd65457daf17b4ad4c4 100644 (file)
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -5103,14 +5103,17 @@ run_eval(const char *cmd, typval_T *rettv
     run_ret = PyRun_String((char *)cmd, Py_eval_input, globals, globals);
     if (run_ret == NULL)
     {
-       if (PyErr_ExceptionMatches(PyExc_SystemExit))
+       if (PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_SystemExit))
        {
            EMSG2(_(e_py_systemexit), "python");
            PyErr_Clear();
        }
-       if (PyErr_Occurred() && !msg_silent)
-           PyErr_PrintEx(0);
-       EMSG(_("E858: Eval did not return a valid python object"));
+       else
+       {
+           if (PyErr_Occurred() && !msg_silent)
+               PyErr_PrintEx(0);
+           EMSG(_("E858: Eval did not return a valid python object"));
+       }
     }
     else
     {

diff --git a/src/version.c b/src/version.c
index 98b64d1b52aa644992089c8eaeee6ce5d2e729ce..4d9af6855b65454607a90b6c49ca4a95f59a9777 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1312,
 /**/
     1311,
 /**/