# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1613339103 -3600
# Node ID 4279c1c66df19a69bb4c7ee769e83b137a0f7887
# Parent  151224bd41f7f86687273d4cc5edfaa7549e353e
patch 8.2.2517: Vim9: fix for s390 not tested on other systems

Commit: https://github.com/vim/vim/commit/7c5b3c03699a4ab31f47c24290852d441ea8c12a
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Feb 14 22:40:57 2021 +0100

    patch 8.2.2517: Vim9: fix for s390 not tested on other systems

    Problem:    Vim9: fix for s390 not tested on other systems.
    Solution:   Add a test.

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
@@ -724,6 +724,27 @@ def Test_try_catch_fails()
   CheckDefFailure(['throw xxx'], 'E1001:')
 enddef
 
+def Try_catch_skipped()
+  var l = []
+  try
+  finally
+  endtry
+
+  if 1
+  else
+    try
+    endtry
+  endif
+enddef
+
+" The skipped try/endtry was updating the wrong instruction.
+def Test_try_catch_skipped()
+  var instr = execute('disassemble Try_catch_skipped')
+  assert_match("NEWLIST size 0\n", instr)
+enddef
+
+
+
 def Test_throw_vimscript()
   # only checks line continuation
   var lines =<< trim END
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 */
 /**/
+    2517,
+/**/
     2516,
 /**/
     2515,