diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 1fc960f..1ecb883 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
Binary files differ
diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
index 69de22b..aae3444 100644
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -1453,6 +1453,7 @@
 
   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 d9307ec..3846e39 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4149,
+/**/
     4148,
 /**/
     4147,