diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-26 15:56:42 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-26 15:56:42 +0100 |
| commit | 0c0dac1fb134309462b263fd5347d9232bfe36ed (patch) | |
| tree | 7c45e75c12063b146ca38e58085634992fa742cc | |
| parent | 4cafa6dc7f0728b018979aff0ca039908ecf2ae1 (diff) | |
| download | vim-git-0c0dac1fb134309462b263fd5347d9232bfe36ed.tar.gz | |
patch 7.4.1424v7.4.1424
Problem: Not using --not-a-term when running tests on MS-Windows.
Solution: Use NO_PLUGIN. (Christian Brabandt)
| -rw-r--r-- | src/testdir/Make_dos.mak | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak index bfd624c51..66cf12f2e 100644 --- a/src/testdir/Make_dos.mak +++ b/src/testdir/Make_dos.mak @@ -114,4 +114,4 @@ bench_re_freeze.out: bench_re_freeze.vim newtests: $(NEW_TESTS) .vim.res: - $(VIMPROG) -u NONE -U NONE -S runtest.vim $*.vim + $(VIMPROG) -u NONE $(NO_PLUGIN) -S runtest.vim $*.vim diff --git a/src/version.c b/src/version.c index 5e246f9dd..fe580e044 100644 --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1424, +/**/ 1423, /**/ 1422, |