diff options
| author | watiko <service@mail.watiko.net> | 2016-02-03 07:07:39 +0900 |
|---|---|---|
| committer | watiko <service@mail.watiko.net> | 2016-02-03 21:56:22 +0900 |
| commit | 7aaffb70015b9df519cff694314d26b3a0f1201f (patch) | |
| tree | a5eb66a46c49788cdeba7a093bd4ee03d136db67 /src | |
| parent | 924cacd2fcf4e2f84886761ad458a9ac4e6407fa (diff) | |
| download | rneovim-7aaffb70015b9df519cff694314d26b3a0f1201f.tar.gz rneovim-7aaffb70015b9df519cff694314d26b3a0f1201f.tar.bz2 rneovim-7aaffb70015b9df519cff694314d26b3a0f1201f.zip | |
vim-patch:7.4.694
Problem: Running tests changes the .viminfo file.
Solution: Disable viminfo in the text objects test.
https://github.com/vim/vim/commit/29d54df5cdd0ef4caa9c050854ddffdabece7a61
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/test_textobjects.in | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/testdir/test_textobjects.in b/src/nvim/testdir/test_textobjects.in index d1cdafcd04..dc48efc67a 100644 --- a/src/nvim/testdir/test_textobjects.in +++ b/src/nvim/testdir/test_textobjects.in @@ -3,7 +3,7 @@ Tests for text-objects vim: set ft=vim : STARTTEST :so small.vim :if !has('textobjects') | e! test.ok | wq! test.out | endif -:set nocompatible +:set nocp viminfo+=nviminfo :" :function SelectionOut(data) : new diff --git a/src/nvim/version.c b/src/nvim/version.c index 2127efca51..d169592d0e 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -594,7 +594,7 @@ static int included_patches[] = { 697, 696, 695, - // 694, + 694, // 693, // 692 NA // 691 NA |