diff options
author | James McCoy <jamessan@jamessan.com> | 2017-09-26 16:04:01 -0400 |
---|---|---|
committer | James McCoy <jamessan@jamessan.com> | 2017-09-26 16:04:32 -0400 |
commit | e0197a4d76420e611e9da2f437f01cb31d65cdb0 (patch) | |
tree | 794bab68473d631e96b43669ebb7897651bc1e99 /src | |
parent | 25d4cd7e2830265505b0f6f88e6d08b4954af6eb (diff) | |
download | rneovim-e0197a4d76420e611e9da2f437f01cb31d65cdb0.tar.gz rneovim-e0197a4d76420e611e9da2f437f01cb31d65cdb0.tar.bz2 rneovim-e0197a4d76420e611e9da2f437f01cb31d65cdb0.zip |
vim-patch:8.0.1025
Problem: Stray copy command in test.
Solution: Remove the copy command.
https://github.com/vim/vim/commit/4e83961985abb78757b135f29ac4ffde675247af
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/testdir/test_mksession.vim | 1 | ||||
-rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/nvim/testdir/test_mksession.vim b/src/nvim/testdir/test_mksession.vim index 13fb07c7e0..4774cf4af5 100644 --- a/src/nvim/testdir/test_mksession.vim +++ b/src/nvim/testdir/test_mksession.vim @@ -148,7 +148,6 @@ func Test_mksession_one_buffer_two_windows() close bwipe! - !cp Xtest_mks.out /tmp call delete('Xtest_mks.out') endfunc diff --git a/src/nvim/version.c b/src/nvim/version.c index 9f75f75d4f..fa8b495703 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -78,7 +78,7 @@ static char *features[] = { // clang-format off static const int included_patches[] = { // 1026, - // 1025, + 1025, 1024, // 1023, // 1022, |