diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-03-21 10:24:40 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-03-22 18:42:17 +0100 |
| commit | 4a2e6f460d02762d211c0f92af305ef5290a667b (patch) | |
| tree | 4696d4604f6090e5607f332df95e1052dd0a9022 | |
| parent | 4c18670e91e22ab4fe566aa181aa6f28166e8aad (diff) | |
| download | rneovim-4a2e6f460d02762d211c0f92af305ef5290a667b.tar.gz rneovim-4a2e6f460d02762d211c0f92af305ef5290a667b.tar.bz2 rneovim-4a2e6f460d02762d211c0f92af305ef5290a667b.zip | |
vim-patch:7.4.2341
Problem: Tiny things. Test doesn't clean up properly.
Solution: Adjust comment and white space. Restore option value.
| -rw-r--r-- | src/nvim/ex_cmds.c | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_autocmd.vim | 3 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index 41f97b0cef..e368838df7 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -2294,7 +2294,7 @@ int do_ecmd( } // 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) || curbuf->terminal ? 0 : DOBUF_UNLOAD, diff --git a/src/nvim/testdir/test_autocmd.vim b/src/nvim/testdir/test_autocmd.vim index 34cca5f612..b5d78c183f 100644 --- a/src/nvim/testdir/test_autocmd.vim +++ b/src/nvim/testdir/test_autocmd.vim @@ -33,6 +33,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() @@ -44,6 +45,7 @@ if has('timers') call feedkeys("a\<C-X>", 'x!') call assert_equal(0, g:triggered) au! CursorHoldI + set updatetime& endfunc endif @@ -223,6 +225,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/nvim/version.c b/src/nvim/version.c index 21f3a493c3..84cb8fea9b 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -100,7 +100,7 @@ static int included_patches[] = { // 2344 NA // 2343, // 2342 NA - // 2341, + 2341, // 2340 NA // 2339, // 2338 NA |