summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/userfunc.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/userfunc.c b/src/userfunc.c
index cc921f5a1..42fa492d7 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -3176,7 +3176,7 @@ call_callback(
// When a :def function was called that uses :try an error would be turned
// into an exception. Need to give the error here.
- if (need_rethrow && current_exception != NULL)
+ if (need_rethrow && current_exception != NULL && trylevel == 0)
{
need_rethrow = FALSE;
handle_did_throw();
diff --git a/src/version.c b/src/version.c
index edb1fbe4e..56d302e23 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3799,
+/**/
3798,
/**/
3797,