From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 22 May 2014 11:12:29 +0000 (+0200)
Subject: updated for version 7.4.296
X-Git-Tag: v7.4.296
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c5a2134dbf880859281c676b834c5a636f78f52;p=vim

updated for version 7.4.296
Problem:    Can't run tests on Solaris.
Solution:   Change the way VIMRUNTIME is set. (Laurent Blume)
---

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 65c82e089..8ae35b918 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -57,7 +57,7 @@ $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
 
 RM_ON_RUN = test.out X* viminfo
 RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok
-RUN_VIM = export VIMRUNTIME=$(SCRIPTSOURCE); $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in
+RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in
 
 clean:
 	-rm -rf *.out *.failed *.rej *.orig test.log $(RM_ON_RUN) $(RM_ON_START) valgrind.*
diff --git a/src/version.c b/src/version.c
index 3ea187df2..93d213088 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    296,
 /**/
     295,
 /**/