Merge remote-tracking branch 'vim/master'

2026-06-07 15:37:14 +02:00 · 2017-11-14 19:20:41 -08:00
parent 96b5eaa1b8 58a8f1706f
commit dc9772e901
3 changed files with 3 additions and 0 deletions
@@ -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 \
@@ -781,6 +781,8 @@ static char *(features[]) =

 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1298,
 /**/
    1297,
 /**/