Merge remote-tracking branch 'vim/master'

Author: splhack

src/Makefile

@@ -1979,6 +1979,7 @@ test1 \
 	test_tagcase \
 	test_textobjects \
 	test_utf8 \
+	test_wordcount \
 	test_writefile \
 	test2 test3 test4 test5 test6 test7 test8 test9 \
 	test10 test11 test12 test13 test14 test15 test16 test17 test18 test19 \
@@ -1994,11 +1995,15 @@ test1 \
 	cd testdir; rm -f [email protected]; $(MAKE) -f Makefile [email protected] VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
 
 test_assert \
+	test_backspace_opt \
 	test_cdo \
+	test_menu \
+	test_quickfix \
 	test_searchpos \
 	test_set \
 	test_sort \
 	test_undolevels \
+	test_unlet \
 	test_viml \
 	test_alot:
 	cd testdir; rm -f [email protected] test.log messages; $(MAKE) -f Makefile [email protected] VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
@@ -2008,7 +2013,7 @@ test_assert \
 	cat testdir/messages
 
 newtests:
-	cd testdir; rm -f $@.res test.log messages; $(MAKE) -f Makefile newtests VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
+	cd testdir; rm -f $@.res test.log messages; $(MAKE) -f Makefile newtestssilent VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
 	@if test -f testdir/test.log; then \
 		cat testdir/test.log; \
 	fi

src/testdir/Makefile

@@ -120,7 +120,11 @@ nolog:
 # Limitation: Only works with the +eval feature.
 RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f -u unix.vim -U NONE --noplugin
 
-newtests: $(NEW_TESTS)
+newtests: newtestssilent
+	@/bin/sh -c "if test -f messages && grep -q 'FAILED' messages; then cat messages && cat test.log; fi"
+
+newtestssilent: $(NEW_TESTS)
+
 
 .vim.res:
 	$(RUN_VIMTEST) -u NONE -S runtest.vim $*.vim

src/version.c

@@ -756,6 +756,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1055,
 /**/
     1054,
 /**/