summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-01-20 11:17:18 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-20 11:17:18 +0000
commitca34db3bdef7238b203386dc82b975ffdf26f839 (patch)
treed212e45652497a79e8287895aa9b3f07ade2f3b8
parentf61c89d2e698e287a9d04c0a29f4ecc0130c2ea2 (diff)
patch 8.2.4149: test override not restored, autocommand left behindv8.2.4149
Problem: Test override not restored, autocommand left behind. Solution: Correct restoring test override. Delete autocommand afterwards.
-rw-r--r--src/testdir/test_autocmd.vim2
-rw-r--r--src/testdir/test_mapping.vim1
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 1fc960f537..1ecb883079 100644
--- 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 69de22ba49..aae3444b20 100644
--- 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 d9307eccb6..3846e39ad8 100644
--- 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 */
/**/
+ 4149,
+/**/
4148,
/**/
4147,