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
index daae0dd6fd9cc56e1a000dce6779f5153b2f6adb..6535de11b2f8d1f463b036b2b06fcaeb7b1552a0 100644 (file)
--- 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
index 3801b0a7e225a720a1d897bfbb1d30ef482ca3df..6ec325eb4eec97b55692ab290aaf7c00ad454089 100644 (file)
--- a/src/message.c
+++ b/src/message.c
@@ -1815,7 +1815,7 @@ screen_puts_mbyte(char_u *s, int l, int attr)
     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 c029ca1bd6a5306fad6db05454494cd83bc703ee..85233797d39ae435ca9edec520d69eaa412d94a1 100644 (file)
--- 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
index 7dba27a03004cc44e2c79c5d234df4d840f63ead..9592e7eeb0fde27df49a76a8882db800eafcee1a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2341,
 /**/
     2340,
 /**/