patch 7.4.694

Problem:    Running tests changes the .viminfo file.
Solution:   Disable viminfo in the text objects test.

diff --git a/src/testdir/test_textobjects.in b/src/testdir/test_textobjects.in
index d1cdafcd044d0124671c828175c815691663dd03..dc48efc67ac3b959b26d5d492db8b4f18f588342 100644 (file)
--- a/src/testdir/test_textobjects.in
+++ b/src/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/version.c b/src/version.c
index 9431180b11bc680efff1c58f1b5b4e5771af90eb..5601c0144931b1a226c5e75e4f68e55ac09656d1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    694,
 /**/
     693,
 /**/