From 6c8e572d098457868c9090fa562d9628c6537849 Mon Sep 17 00:00:00 2001
From: watiko <service@mail.watiko.net>
Date: Sun, 10 Jan 2016 09:10:17 +0900
Subject: vim-patch:7.4.1055

Problem:    Running "make newtests" in src/testdir has no output.
Solution:   List the messages file when a test fails. (Christian Brabandt)
            Update the list of tests.

https://github.com/vim/vim/commit/e7893a4088d6ea796bcab6195d232cb26c12c317
---
 src/nvim/testdir/Makefile |  7 ++++++-
 src/nvim/version.c        | 23 +++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index 23a9b97d91..efcb8a68d2 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -158,7 +158,12 @@ nolog:
 # Limitation: Only works with the +eval feature.
 RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -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)
 
 %.res: %.vim .gdbinit
 	$(RUN_VIMTEST) -u runtest.vim $*.vim
diff --git a/src/nvim/version.c b/src/nvim/version.c
index b6f4f2f5bb..d0a2771a19 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -69,6 +69,29 @@ static char *features[] = {
 
 // clang-format off
 static int included_patches[] = {
+  1055,
+  // 1054,
+  // 1053,
+  // 1052,
+  // 1051,
+  // 1050,
+  // 1049,
+  // 1048,
+  // 1047,
+  // 1046,
+  // 1045,
+  // 1044,
+  // 1043,
+  // 1042,
+  // 1041,
+  // 1040,
+  // 1039,
+  // 1038,
+  // 1037,
+  // 1036,
+  // 1035,
+  // 1034,
+  // 1033,
   1032,
   // 1031,
   // 1030,
-- 
cgit