updated for version 7.4.084
Problem: Python: interrupt not being properly discarded. (Yggdroot Chen)
Solution: Discard interrupt in VimTryEnd. (ZyX)
diff --git a/src/if_py_both.h b/src/if_py_both.h
index 7485779..e6db4a3 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -558,7 +558,11 @@
/* Keyboard interrupt should be preferred over anything else */
if (got_int)
{
- did_throw = got_int = FALSE;
+ if (current_exception != NULL)
+ discard_current_exception();
+ else
+ need_rethrow = did_throw = FALSE;
+ got_int = FALSE;
PyErr_SetNone(PyExc_KeyboardInterrupt);
return -1;
}
@@ -567,7 +571,10 @@
/* Python exception is preferred over vim one; unlikely to occur though */
else if (PyErr_Occurred())
{
- did_throw = FALSE;
+ if (current_exception != NULL)
+ discard_current_exception();
+ else
+ need_rethrow = did_throw = FALSE;
return -1;
}
/* Finally transform VimL exception to python one */