# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1614031204 -3600
# Node ID 5dbed4837ea3e46c29eabd99fd16eecaebdcd9fb
# Parent  b0191a86ab43250f64b5618d39f61d803e80ca26
patch 8.2.2543: Vim9: a return inside try/catch does not restore properly

Commit: https://github.com/vim/vim/commit/9cb577a68277d46cc1134ef1723e90ff5f1d1b5c
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Feb 22 22:45:10 2021 +0100

    patch 8.2.2543: Vim9: a return inside try/catch does not restore properly

    Problem:    Vim9: a return inside try/catch does not restore exception state
                properly.
    Solution:   When there is no ":finally" jump to ":endtry". (closes #7882)

diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -589,6 +589,18 @@ def Test_try_catch_throw()
   assert_equal(4, ReturnInFinally())
 enddef
 
+def Test_nocatch_return_in_try()
+  # return in try block returns normally
+  def ReturnInTry(): string
+    try
+      return '"some message"'
+    catch
+    endtry
+    return 'not reached'
+  enddef
+  exe 'echoerr ' .. ReturnInTry()
+enddef
+
 def Test_cnext_works_in_catch()
   var lines =<< trim END
       vim9script
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2543,
+/**/
     2542,
 /**/
     2541,
diff --git a/src/vim9execute.c b/src/vim9execute.c
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -2517,11 +2517,13 @@ call_def_function(
 			trycmd = ((trycmd_T *)trystack->ga_data)
 							+ trystack->ga_len - 1;
 		    if (trycmd != NULL
-				  && trycmd->tcd_frame_idx == ectx.ec_frame_idx
-				  && trycmd->tcd_finally_idx != 0)
+				 && trycmd->tcd_frame_idx == ectx.ec_frame_idx)
 		    {
-			// jump to ":finally" once
-			ectx.ec_iidx = trycmd->tcd_finally_idx;
+			// jump to ":finally" or ":endtry"
+			if (trycmd->tcd_finally_idx != 0)
+			    ectx.ec_iidx = trycmd->tcd_finally_idx;
+			else
+			    ectx.ec_iidx = trycmd->tcd_endtry_idx;
 			trycmd->tcd_return = TRUE;
 		    }
 		    else