patch 8.2.4149: test override not restored, autocommand left behind

Problem:    Test override not restored, autocommand left behind.
Solution:   Correct restoring test override.  Delete autocommand afterwards.

diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 1fc960f537d63aa9554e2671e8c305e2cd90c22d..1ecb8830797a2586710f361f7bffb7f69dba8a02 100644 (file)
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -2038,7 +2038,7 @@ func Test_TextChangedI_with_setline()
   call assert_equal('', getline(1))
   call assert_equal('', getline(2))
 
-  call test_override('starting', 0)
+  call test_override('char_avail', 0)
   bwipe!
 endfunc
 

diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
index 69de22ba4974585da38942c41683206281c99b71..aae3444b204b9e50064da9e374188d5199e5bfa4 100644 (file)
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -1453,6 +1453,7 @@ func Test_map_script_cmd_survives_unmap()
 
   nunmap <F3>
   unlet b:result
+  autocmd! CmdlineEnter
 endfunc
 
 " Test for using <script> with a map to remap characters in rhs

diff --git a/src/version.c b/src/version.c
index d9307eccb69bd291edfc8f2fee3b61bb1cc076fa..3846e39ad85ee2c7928e23f6bb4827580e9f7f20 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 */
+/**/
+    4149,
 /**/
     4148,
 /**/