From 7aaffb70015b9df519cff694314d26b3a0f1201f Mon Sep 17 00:00:00 2001
From: watiko <service@mail.watiko.net>
Date: Wed, 3 Feb 2016 07:07:39 +0900
Subject: [PATCH] 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
---
 src/nvim/testdir/test_textobjects.in | 2 +-
 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