From: Bram Moolenaar Date: Mon, 13 Apr 2015 10:58:12 +0000 (+0200) Subject: patch 7.4.694 X-Git-Tag: v7.4.694 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29d54df5cdd0ef4caa9c050854ddffdabece7a61;p=thirdparty%2Fvim.git 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 d1cdafcd04..dc48efc67a 100644 --- 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 9431180b11..5601c01449 100644 --- 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, /**/