patch 8.2.5078: substitute test has a one second delay

Problem:    Substitute test has a one second delay.
Solution:   Use ":silent!".  Add another test case. (closes #10558)

diff --git a/src/testdir/test_substitute.vim b/src/testdir/test_substitute.vim
index 5061c97261812c10ce14f5b8a176bd3d5ececa6f..46ea95513192862229443c821e9945590de99622 100644 (file)
--- a/src/testdir/test_substitute.vim
+++ b/src/testdir/test_substitute.vim
@@ -469,7 +469,6 @@ func Run_SubCmd_Tests(tests)
   for t in a:tests
     let start = line('.') + 1
     let end = start + len(t[2]) - 1
-    " TODO: why is there a one second delay the first time we get here?
     exe "normal o" . t[0]
     call cursor(start, 1)
     exe t[1]
@@ -504,7 +503,8 @@ func Test_sub_cmd_1()
              \ ['sSs', 's/S/\c/', ['scs']],
              \ ['tTt', "s/T/\<C-V>\<C-J>/", ["t\<C-V>\<C-J>t"]],
              \ ['U', 's/U/\L\uuUu\l\EU/', ['UuuU']],
-             \ ['V', 's/V/\U\lVvV\u\Ev/', ['vVVv']]
+             \ ['V', 's/V/\U\lVvV\u\Ev/', ['vVVv']],
+             \ ['\', 's/\\/\\\\/', ['\\']]
              \ ]
   call Run_SubCmd_Tests(tests)
 endfunc
@@ -535,7 +535,8 @@ func Test_sub_cmd_2()
              \ ['sSs', 's/S/\c/', ['scs']],
              \ ['tTt', "s/T/\<C-V>\<C-J>/", ["t\<C-V>\<C-J>t"]],
              \ ['U', 's/U/\L\uuUu\l\EU/', ['UuuU']],
-             \ ['V', 's/V/\U\lVvV\u\Ev/', ['vVVv']]
+             \ ['V', 's/V/\U\lVvV\u\Ev/', ['vVVv']],
+             \ ['\', 's/\\/\\\\/', ['\\']]
              \ ]
   call Run_SubCmd_Tests(tests)
 endfunc
@@ -690,10 +691,11 @@ func Test_nocatch_sub_failure_handling()
   endfunc
   new
   call setline(1, ['1 aaa', '2 aaa', '3 aaa'])
-  %s/aaa/\=Foo()/g
+  " need silent! to avoid a delay when entering Insert mode
+  silent! %s/aaa/\=Foo()/g
   call assert_equal(['1 0', '2 0', '3 0'], getline(1, 3))
 
-  " Trow without try-catch causes abort after the first line.
+  " Throw without try-catch causes abort after the first line.
   " We cannot test this, since it would stop executing the test script.
 
   " try/catch does not result in any changes

diff --git a/src/version.c b/src/version.c
index f5c0fd7c5f1b53ca89437d264ef7d23f3ca6d1d0..aec6f4b279ba6d16a8377bda02296f0959021345 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5078,
 /**/
     5077,
 /**/