IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1100 from atwupack/vp-7.4.296

Browse Source 
vim-patch:7.4.296
This commit is contained in:
Justin M. Keyes 2014-08-22 01:51:01 -04:00
commit 7df4ed3a5b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/testdir/Makefile
View File

@ -90,7 +90,7 @@ $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG) test1.out
RM_ON_RUN := test.out X* viminfo RM_ON_RUN := test.out X* viminfo
RM_ON_START := tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok 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: clean:
-rm -rf *.out \ -rm -rf *.out \

2
src/nvim/version.c
View File

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