# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1473193807 -7200
# Node ID b67088aae933639e7d6c5d3c2fbf9272d438f994
# Parent  b11ceef7116efb8debc41041f848183713f65ee7
commit https://github.com/vim/vim/commit/aeac9006d5d14910f214f09df52c026a5936e737
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Sep 6 22:15:08 2016 +0200

    patch 7.4.2341
    Problem:    Tiny things.  Test doesn't clean up properly.
    Solution:   Adjust comment and white space. Restore option value.

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3947,7 +3947,7 @@ do_ecmd(
 		    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
--- a/src/message.c
+++ b/src/message.c
@@ -1815,7 +1815,7 @@ screen_puts_mbyte(char_u *s, int l, int 
     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
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -20,6 +20,7 @@ if has('timers')
     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 @@ if has('timers')
     call feedkeys("a\<C-X>", 'x!')
     call assert_equal(0, g:triggered)
     au! CursorHoldI
+    set updatetime&
   endfunc
 endif
 
@@ -220,6 +222,7 @@ func Test_augroup_warning()
   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
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2341,
+/**/
     2340,
 /**/
     2339,