diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-09-06 22:15:08 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-09-06 22:15:08 +0200 |
| commit | aeac9006d5d14910f214f09df52c026a5936e737 (patch) | |
| tree | 53c5b2efb24387c625d95ff4f5af4d1436c57c76 | |
| parent | 64d8e25bf6efe5f18b032563521c3ce278c316ab (diff) | |
| download | vim-git-aeac9006d5d14910f214f09df52c026a5936e737.tar.gz | |
patch 7.4.2341v7.4.2341
Problem: Tiny things. Test doesn't clean up properly.
Solution: Adjust comment and white space. Restore option value.
| -rw-r--r-- | src/ex_cmds.c | 2 | ||||
| -rw-r--r-- | src/message.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_autocmd.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index daae0dd6f..6535de11b 100644 --- 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 3801b0a7e..6ec325eb4 100644 --- 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 c029ca1bd..85233797d 100644 --- 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 7dba27a03..9592e7eeb 100644 --- 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, |