diff --git a/runtime/syntax/testdir/viewdumps.vim b/runtime/syntax/testdir/viewdumps.vim
index e1624ff622..9c4de1b930 100644
--- a/runtime/syntax/testdir/viewdumps.vim
+++ b/runtime/syntax/testdir/viewdumps.vim
@@ -21,4 +21,4 @@ set display=lastline ruler scrolloff=5 t_ZH= t_ZR=
 # Anticipate non-Latin-1 characters in "input/" files.
 set encoding=utf-8 termencoding=utf-8
 
-# vim:fdm=syntax:sw=2:ts=8:noet:nolist:nosta:
+# vim:fdm=syntax:sw=2:ts=8:noet:nosta:
diff --git a/src/testdir/commondumps.vim b/src/testdir/commondumps.vim
index cfe426cbde..1211ae9c4e 100644
--- a/src/testdir/commondumps.vim
+++ b/src/testdir/commondumps.vim
@@ -73,4 +73,4 @@ def g:Init(subtreedirname: string, count: number)
   endif
 enddef
 
-# vim:fdm=syntax:sw=2:ts=8:noet:nolist:nosta:
+# vim:fdm=syntax:sw=2:ts=8:noet:nosta:
diff --git a/src/testdir/gen_opt_test.vim b/src/testdir/gen_opt_test.vim
index 9d942af04f..1c231f9c52 100644
--- a/src/testdir/gen_opt_test.vim
+++ b/src/testdir/gen_opt_test.vim
@@ -481,4 +481,4 @@ endif
 
 qa!
 
-" vim:sw=2:ts=8:noet:nolist:nosta:
+" vim:sw=2:ts=8:noet:nosta:
diff --git a/src/testdir/viewdumps.vim b/src/testdir/viewdumps.vim
index 62f7bbe71b..ffb7314e14 100644
--- a/src/testdir/viewdumps.vim
+++ b/src/testdir/viewdumps.vim
@@ -8,4 +8,4 @@ g:Init('\<src\>', 0)
 # Match ":language" of runtest.vim.
 language messages C
 
-# vim:fdm=syntax:sw=2:ts=8:noet:nolist:nosta:
+# vim:fdm=syntax:sw=2:ts=8:noet:nosta:
diff --git a/src/version.c b/src/version.c
index 12f873227a..2a85be9431 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    807,
 /**/
     806,
 /**/