diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-08-22 01:51:01 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-08-22 01:51:01 -0400 |
| commit | 7df4ed3a5b8779ca7fa9f42e0f0455b033461b82 (patch) | |
| tree | 41142c77674ad8e634bb5a178a81db8cdb4ae09b /src | |
| parent | 51ae9c643744995c2d3b6a466b6ad2333e1cba8c (diff) | |
| parent | bc56d3a988767d6ea67f18c1c86311220dfae5e0 (diff) | |
| download | rneovim-7df4ed3a5b8779ca7fa9f42e0f0455b033461b82.tar.gz rneovim-7df4ed3a5b8779ca7fa9f42e0f0455b033461b82.tar.bz2 rneovim-7df4ed3a5b8779ca7fa9f42e0f0455b033461b82.zip | |
Merge pull request #1100 from atwupack/vp-7.4.296
vim-patch:7.4.296
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/Makefile | 2 | ||||
| -rw-r--r-- | 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, |