Merge pull request #1100 from atwupack/vp-7.4.296

vim-patch:7.4.296

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          \

src/nvim/version.c

@@ -299,7 +299,7 @@ static int included_patches[] = {
   //299 NA
   298,
   //297,
-  //296,
+  296,
   295,
   294,
   293,