From ca34db3bdef7238b203386dc82b975ffdf26f839 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 20 Jan 2022 11:17:18 +0000
Subject: [PATCH] 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.
---
 src/testdir/test_autocmd.vim | 2 +-
 src/testdir/test_mapping.vim | 1 +
 src/version.c                | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 1fc960f53..1ecb88307 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 69de22ba4..aae3444b2 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 d9307eccb..3846e39ad 100644
--- 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,
 /**/
-- 
2.50.1