Merge remote-tracking branch 'vim/master'

splhack · splhack · commit dc9772e9010f · 2017-11-14T19:20:41.000-08:00
diff --git a/Filelist b/Filelist
@@ -135,6 +135,7 @@ SRC_ALL =	\
 		src/testdir/bench*.in \
 		src/testdir/bench*.vim \
 		src/testdir/samples/*.txt \
+		src/testdir/samples/test000 \
 		src/testdir/if_ver*.vim \
 		src/testdir/xterm_ramp.vim \
 		src/proto.h \
diff --git a/src/testdir/samples/test000 b/src/testdir/samples/test000
diff --git a/src/version.c b/src/version.c
@@ -781,6 +781,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1298,
 /**/
     1297,
 /**/
