diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index daae0dd..6535de1 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3947,7 +3947,7 @@
 		    buf_copy_options(buf, BCO_ENTER);
 
 		/* Close the link to the current buffer. This will set
-		 * curwin->w_buffer to NULL. */
+		 * oldwin->w_buffer to NULL. */
 		u_sync(FALSE);
 		close_buffer(oldwin, curbuf,
 			       (flags & ECMD_HIDE) ? 0 : DOBUF_UNLOAD, FALSE);
diff --git a/src/message.c b/src/message.c
index 3801b0a..6ec325e 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1815,7 +1815,7 @@
     void
 msg_puts(char_u *s)
 {
- msg_puts_attr(s, 0);
+    msg_puts_attr(s, 0);
 }
 
     void
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index c029ca1..8523379 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -20,6 +20,7 @@
     call feedkeys('a', 'x!')
     call assert_equal(1, g:triggered)
     au! CursorHoldI
+    set updatetime&
   endfunc
 
   func Test_cursorhold_insert_ctrl_x()
@@ -31,6 +32,7 @@
     call feedkeys("a\<C-X>", 'x!')
     call assert_equal(0, g:triggered)
     au! CursorHoldI
+    set updatetime&
   endfunc
 endif
 
@@ -220,6 +222,7 @@
   augroup Another
   augroup END
   call assert_true(match(execute('au VimEnter'), "-Deleted-.*VimEnter") >= 0)
+  augroup! Another
 
   " no warning for postpone aucmd delete
   augroup StartOK
diff --git a/src/version.c b/src/version.c
index 7dba27a..9592e7e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2341,
+/**/
     2340,
 /**/
     2339,