diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-11-11 01:05:48 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-11-11 01:05:48 +0100 |
| commit | d6b8a5253b293b90a90af4320e9fd1c6e587ad2b (patch) | |
| tree | ff3b1dc7266f430578284b0d1b43d18a09cdd697 /src/if_py_both.h | |
| parent | a939e434407b749adf4d50ea9f3f13b6a9abaf86 (diff) | |
| download | vim-git-d6b8a5253b293b90a90af4320e9fd1c6e587ad2b.tar.gz | |
updated for version 7.4.084v7.4.084
Problem: Python: interrupt not being properly discarded. (Yggdroot Chen)
Solution: Discard interrupt in VimTryEnd. (ZyX)
Diffstat (limited to 'src/if_py_both.h')
| -rw-r--r-- | src/if_py_both.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h index 748577981..e6db4a3d0 100644 --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -558,7 +558,11 @@ VimTryEnd(void) /* 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 @@ VimTryEnd(void) /* 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 */ |