From 90537ae970f571a596fe081fd3dd2d1cbf538b2a Mon Sep 17 00:00:00 2001 From: Shougo Matsushita Date: Sat, 19 Dec 2015 10:40:38 +0900 Subject: [PATCH] vim-patch:7.4.604 Problem: Running tests changes viminfo. Solution: Disable viminfo. https://github.com/vim/vim/commit/6bf7c523ad54f625547ef2cc6009c28c0dd337ed --- src/nvim/testdir/test_breakindent.in | 2 +- src/nvim/version.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nvim/testdir/test_breakindent.in b/src/nvim/testdir/test_breakindent.in index b05aef7f8d..5a8e580c4a 100644 --- a/src/nvim/testdir/test_breakindent.in +++ b/src/nvim/testdir/test_breakindent.in @@ -101,7 +101,7 @@ fygjyl:let line2 = @0 :$put =line2 :" :let g:test="Test 14: breakindent + visual blockwise delete #1" -:set all& breakindent +:set all& breakindent shada+=nX-test-breakindent.shada :30vnew :normal! 3a1234567890 :normal! a abcde diff --git a/src/nvim/version.c b/src/nvim/version.c index 33c310a8b2..9a9cb509a8 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -389,7 +389,7 @@ static int included_patches[] = { // 607, 606, // 605, - // 604, + 604, // 603, 602, 601,