patch 8.2.2217: Vim9: command modifiers not restored in catch block

Problem:    Vim9: command modifiers not restored in catch block.
Solution:   Restore command modifiers. (closes #7542)

diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim
index a55ba64031e1fc43a474641ed4e8e366e5a5a4c4..f5619b488d1ec1a49b44bb3d50034a877e90f3e3 100644 (file)
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -546,6 +546,13 @@ def Test_modifier_silent_unsilent()
 
   silent EchoThere()
   assert_equal("\nthere", execute(':1messages'))
+
+  try
+    silent eval [][0]
+  catch
+    echomsg "caught"
+  endtry
+  assert_equal("\ncaught", execute(':1messages'))
 enddef
 
 def Test_range_after_command_modifier()

diff --git a/src/version.c b/src/version.c
index 6f30739b74c6c9a9adf30302c868a286621ca7c8..f48c2afd3cbf4d03cf401c292c0b9f7c1d3e7bd1 100644 (file)
--- 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 */
+/**/
+    2217,
 /**/
     2216,
 /**/

diff --git a/src/vim9execute.c b/src/vim9execute.c
index 41505925680a5441ba3829f4542583841799c27b..4d889916763d3fee22754d2855fc443ebb8c4640 100644 (file)
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -2286,6 +2286,13 @@ call_def_function(
                {
                    garray_T    *trystack = &ectx.ec_trystack;
 
+                   if (restore_cmdmod)
+                   {
+                       cmdmod.cmod_filter_regmatch.regprog = NULL;
+                       undo_cmdmod(&cmdmod);
+                       cmdmod = save_cmdmod;
+                       restore_cmdmod = FALSE;
+                   }
                    if (trystack->ga_len > 0)
                    {
                        trycmd_T    *trycmd = ((trycmd_T *)trystack->ga_data)