From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 13 Dec 2021 19:14:52 +0000 (+0000)
Subject: patch 8.2.3799: edit test hangs or fails
X-Git-Tag: v8.2.3799
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=80d60910ff493f7b8ea52156e4c7df7e70a348c6;p=vim

patch 8.2.3799: edit test hangs or fails

Problem:    Edit test hangs or fails.
Solution:   Do not rethrow an exception when inside try/catch.
---

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
@@ -749,6 +749,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3799,
 /**/
     3798,
 /**/