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 65c82e08956fe3ef68f1d46638cb483c604d0674..8ae35b918bca067e573ca66d6531d4e0ddfbdb3f 100644 (file)
--- 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 3ea187df271fb588432c779b65e2e97d15e370de..93d213088592570f02cefde0fcb4624b5bd15624 100644 (file)
--- 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,
 /**/