Permalink
Browse files

patch 7.4.2341

Problem:    Tiny things.  Test doesn't clean up properly.
Solution:   Adjust comment and white space. Restore option value.
  • Loading branch information...
1 parent 64d8e25 commit aeac9006d5d14910f214f09df52c026a5936e737 @brammool brammool committed Sep 6, 2016
Showing with 7 additions and 2 deletions.
  1. +1 −1 src/ex_cmds.c
  2. +1 −1 src/message.c
  3. +3 −0 src/testdir/test_autocmd.vim
  4. +2 −0 src/version.c
View
@@ -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);
View
@@ -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
@@ -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
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2341,
+/**/
2340,
/**/
2339,

0 comments on commit aeac900

Please sign in to comment.