From bc56d3a988767d6ea67f18c1c86311220dfae5e0 Mon Sep 17 00:00:00 2001
From: André Twupack <atwupack@mailbox.org>
Date: Thu, 21 Aug 2014 19:06:07 +0200
Subject: vim-patch:7.4.296

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

https://code.google.com/p/vim/source/detail?r=v7-4-296
---
 src/nvim/testdir/Makefile | 2 +-
 src/nvim/version.c        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index db88755a01..92fd47ff6b 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -90,7 +90,7 @@ $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG) test1.out
 
 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); $(TOOL) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in
+RUN_VIM     := VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(TOOL) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in
 
 clean:
 	-rm -rf *.out          \
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 5684a3f8d8..fa8008280f 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -299,7 +299,7 @@ static int included_patches[] = {
   //299 NA
   298,
   //297,
-  //296,
+  296,
   295,
   294,
   293,
-- 
cgit