aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.2341

Browse Source 
Problem:    Tiny things.  Test doesn't clean up properly.
Solution:   Adjust comment and white space. Restore option value.
This commit is contained in:
Bram Moolenaar 2016-09-06 22:15:08 +02:00
parent 64d8e25bf6
commit aeac9006d5
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ex_cmds.c
View File

@ -3947,7 +3947,7 @@ do_ecmd(
buf_copy_options(buf, BCO_ENTER); buf_copy_options(buf, BCO_ENTER);
/* Close the link to the current buffer. This will set /* Close the link to the current buffer. This will set
* curwin->w_buffer to NULL. */ * oldwin->w_buffer to NULL. */
u_sync(FALSE); u_sync(FALSE);
close_buffer(oldwin, curbuf, close_buffer(oldwin, curbuf,
(flags & ECMD_HIDE) ? 0 : DOBUF_UNLOAD, FALSE); (flags & ECMD_HIDE) ? 0 : DOBUF_UNLOAD, FALSE);

2
src/message.c
View File

@ -1815,7 +1815,7 @@ screen_puts_mbyte(char_u *s, int l, int attr)
void void
msg_puts(char_u *s) msg_puts(char_u *s)
{ {
msg_puts_attr(s, 0); msg_puts_attr(s, 0);
} }
void void

3
src/testdir/test_autocmd.vim
View File

@ -20,6 +20,7 @@ if has('timers')
call feedkeys('a', 'x!') call feedkeys('a', 'x!')
call assert_equal(1, g:triggered) call assert_equal(1, g:triggered)
au! CursorHoldI au! CursorHoldI
set updatetime&
endfunc endfunc
func Test_cursorhold_insert_ctrl_x() func Test_cursorhold_insert_ctrl_x()
@ -31,6 +32,7 @@ if has('timers')
call feedkeys("a\<C-X>", 'x!') call feedkeys("a\<C-X>", 'x!')
call assert_equal(0, g:triggered) call assert_equal(0, g:triggered)
au! CursorHoldI au! CursorHoldI
set updatetime&
endfunc endfunc
endif endif
@ -220,6 +222,7 @@ func Test_augroup_warning()
augroup Another augroup Another
augroup END augroup END
call assert_true(match(execute('au VimEnter'), "-Deleted-.*VimEnter") >= 0) call assert_true(match(execute('au VimEnter'), "-Deleted-.*VimEnter") >= 0)
augroup! Another
" no warning for postpone aucmd delete " no warning for postpone aucmd delete
augroup StartOK augroup StartOK

2
src/version.c
View File

@ -763,6 +763,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2341,
/**/ /**/
2340, 2340,
/**/ /**/