diff --git a/src/testdir/Makefile b/src/testdir/Makefile index f28c9414f..bf64a0383 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -74,10 +74,10 @@ $(SCRIPTS) $(SCRIPTS_GUI) $(NEW_TESTS_RES): $(SCRIPTS_FIRST) $(NEW_TESTS): rm -f $@.res test.log messages $(MAKE) -f Makefile $@.res - @if test -f test.log; then \ - cat test.log; \ - fi cat messages + @if test -f test.log; then \ + exit 1; \ + fi RM_ON_RUN = test.out X* viminfo RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim test.ok benchmark.out diff --git a/src/version.c b/src/version.c index f63c5f37f..75ebdc1ed 100644 --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1490, /**/ 1489, /**/