diff --git a/src/testdir/test17.in b/src/testdir/test17.in
index bc542c7..3a0a9bb 100644
--- a/src/testdir/test17.in
+++ b/src/testdir/test17.in
@@ -49,17 +49,17 @@
 :!mkdir Xdir1
 :!mkdir "Xdir1/dir2"
 :e! Xdir1/dir2/foo.a
-i#include   "bar.a"
+i#include   "bar.a":
 :w
 :e Xdir1/dir2/bar.a
-i#include      "baz.a"
+i#include      "baz.a":
 :w
 :e Xdir1/dir2/baz.a
-i#include            "foo.a"
+i#include            "foo.a":
 :w
 :e Xbase.a
 :set path=Xdir1/dir2
-i#include    <foo.a>
+i#include    <foo.a>:
 :w
 :redir! >>test.out
 :checkpath!
@@ -79,17 +79,17 @@
 :endfunction
 :let &includeexpr='DotsToSlashes()'
 :e! Xdir1/dir2/foo.b
-i%inc   /bar/
+i%inc   /bar/:
 :w
 :e Xdir1/dir2/bar.b
-i%inc      /baz/
+i%inc      /baz/:
 :w
 :e Xdir1/dir2/baz.b
-i%inc            /foo/
+i%inc            /foo/:
 :w
 :e Xbase.b
 :set path=Xdir1/dir2
-i%inc    /foo/
+i%inc    /foo/:
 :w
 :redir! >>test.out
 :checkpath!
@@ -112,20 +112,20 @@
 :endfunction
 :let &includeexpr='StripNewlineChar()'
 :e! Xdir1/dir2/foo.c
-i%inc   bar.c
+i%inc   bar.c:
 :w
 :e Xdir1/dir2/bar.c
-i%inc      baz.c
+i%inc      baz.c:
 :w
 :e Xdir1/dir2/baz.c
-i%inc            foo.c
+i%inc            foo.c:
 :w
 :e Xdir1/dir2/FALSE.c
-i%inc            foo.c
+i%inc            foo.c:
 :w
 :e Xbase.c
 :set path=Xdir1/dir2
-i%inc    FALSE.c foo.c
+i%inc    FALSE.c foo.c:
 :w
 :redir! >>test.out
 :checkpath!
diff --git a/src/testdir/test29.in b/src/testdir/test29.in
index 1d6cb6f..65e28c1 100644
--- a/src/testdir/test29.in
+++ b/src/testdir/test29.in
Binary files differ
diff --git a/src/testdir/test4.in b/src/testdir/test4.in
index b8bd9fc..b3ee49b 100644
--- a/src/testdir/test4.in
+++ b/src/testdir/test4.in
@@ -19,7 +19,7 @@
 G:r Xxx             " include Xxx in the current file
 :set fo+=r          " issue #57 do not move cursor on <c-o> when autoindent is set
 Go# abcdef2hi
-d0o# abcdef2hid0
+d0o# abcdef2hid0:
 :?startstart?,$w! test.out
 :qa!
 ENDTEST
diff --git a/src/testdir/test61.in b/src/testdir/test61.in
index dc24ab9..b18bbb5 100644
--- a/src/testdir/test61.in
+++ b/src/testdir/test61.in
@@ -87,19 +87,19 @@
 :so small.vim
 :set nocp viminfo+=nviminfo
 :enew!
-oa
+oa:
 :set ul=100
-ob
+ob:
 :set ul=100
 o1a2=setline('.','1234')
 
 uu:"
-oc
+oc:
 :set ul=100
 o1a2=setline('.','1234')
 
 u:"
-od
+od:
 :set ul=100
 o1a2=string(123)
 u:"
diff --git a/src/testdir/test82.in b/src/testdir/test82.in
index 8503f54..5ee9116 100644
--- a/src/testdir/test82.in
+++ b/src/testdir/test82.in
@@ -9,7 +9,7 @@
 : qa!
 :endif
 :set enc=utf8
-ggdG
+ggdG:
 :
 :function! Ch(a, op, b, expected)
 :  if eval(printf('"%s" %s "%s"', a:a, a:op, a:b)) != a:expected
diff --git a/src/testdir/test83.in b/src/testdir/test83.in
index 297d560..f24c1b8 100644
--- a/src/testdir/test83.in
+++ b/src/testdir/test83.in
@@ -8,16 +8,16 @@
 : w! test.out
 : qa!
 :endif
-
+:
 :/^text for tags1$/,/^text for tags1$/+1w! Xtags1.txt
 :/^text for tags2$/,/^text for tags2$/+1w! Xtags2.txt
 :/^text for tags3$/,/^text for tags3$/+1w! Xtags3.txt
 :/^tags1$/+1,/^tags1-end$/-1w! Xtags1
-
-ggdG
-
+:
+ggdG:
+:
 :call setline('.', 'Results of test83')
-
+:
 :" case1:
 :new
 :set tags=Xtags1
@@ -30,7 +30,7 @@
 : close
 : put ='case1: ok'
 :endif
-
+:
 :" case2:
 :new
 :set tags=test83-tags2
@@ -43,7 +43,7 @@
 : close
 : put ='case2: ok'
 :endif
-
+:
 :" case3:
 :new
 :set tags=test83-tags3
@@ -57,7 +57,7 @@
 : put ='case3: ok'
 :endif
 :close
-
+:
 :wq! test.out
 ENDTEST
 
diff --git a/src/testdir/test90.in b/src/testdir/test90.in
index 6bac414..27a87c6 100644
--- a/src/testdir/test90.in
+++ b/src/testdir/test90.in
@@ -46,7 +46,7 @@
 : let res='ng'
 :endif
 :$put =testcase.res
-"
+:"
 :/^start:/,$wq! test.out
 ENDTEST
 
diff --git a/src/testdir/test95.in b/src/testdir/test95.in
index 9fac4d2..934afde 100644
--- a/src/testdir/test95.in
+++ b/src/testdir/test95.in
@@ -18,7 +18,7 @@
 :"    etc.
 :"  When there is no match use only the first two items.
 :let tl = []
-
+:
 :"""" Multi-byte character tests. These will fail unless vim is compiled
 :"""" with Multibyte (FEAT_MBYTE) or BIG/HUGE features.
 :call add(tl, [2, '[[:alpha:][=a=]]\+', '879 aiaãâaiuvna ', 'aiaãâaiuvna'])
@@ -26,15 +26,15 @@
 :call add(tl, [2, '[^ม ]\+', 'มม oijasoifjos ifjoisj f osij j มมมมม abcd', 'oijasoifjos'])
 :call add(tl, [2, ' [^ ]\+', 'start มabcdม ', ' มabcdม'])
 :call add(tl, [2, '[ม[:alpha:][=a=]]\+', '879 aiaãมâมaiuvna ', 'aiaãมâมaiuvna'])
-
+:
 :" this is not a normal "i" but 0xec
 :call add(tl, [2, '\p\+', 'ìa', 'ìa'])
 :call add(tl, [2, '\p*', 'aあ', 'aあ'])
-
+:
 :"""" Test recognition of some character classes
 :call add(tl, [2, '\i\+', '&*¨xx ', 'xx'])
 :call add(tl, [2, '\f\+', '&*fname ', 'fname'])
-
+:
 :"""" Test composing character matching
 :call add(tl, [2, '.ม', 'xม่x yมy', 'yม'])
 :call add(tl, [2, '.ม่', 'xม่x yมy', 'xม่'])
@@ -56,8 +56,8 @@
 :call add(tl, [2, 'a\%C', "ca\u0300t", "a\u0300"])
 :call add(tl, [2, 'ca\%C', "ca\u0300t", "ca\u0300"])
 :call add(tl, [2, 'ca\%Ct', "ca\u0300t", "ca\u0300t"])
-
-
+:
+:
 :"""" Test \Z
 :call add(tl, [2, 'ú\Z', 'x'])
 :call add(tl, [2, 'יהוה\Z', 'יהוה', 'יהוה'])
@@ -75,12 +75,12 @@
 :call add(tl, [2, "\\Z\u05b9", "xy\u05b9z", "y\u05b9"])
 :call add(tl, [1, "\u05b9\\+\\Z", "xy\u05b9z\u05b9 ", "y\u05b9z\u05b9"])
 :call add(tl, [1, "\\Z\u05b9\\+", "xy\u05b9z\u05b9 ", "y\u05b9z\u05b9"])
-
+:
 :"""" Combining different tests and features
 :call add(tl, [2, '[^[=a=]]\+', 'ddaãâbcd', 'dd'])
-
+:
 :"""" Run the tests
-
+:
 :"
 :for t in tl
 :  let re = t[0]
@@ -124,7 +124,7 @@
 :  endfor
 :endfor
 :unlet t tl e l
-
+:
 :" check that 'ambiwidth' does not change the meaning of \p
 :set regexpengine=1 ambiwidth=single
 :$put ='eng 1 ambi single: ' . match(\"\u00EC\", '\p')
@@ -134,7 +134,7 @@
 :$put ='eng 2 ambi single: ' . match(\"\u00EC\", '\p')
 :set regexpengine=2 ambiwidth=double
 :$put ='eng 2 ambi double: ' . match(\"\u00EC\", '\p')
-
+:
 :/\%#=1^Results/,$wq! test.out
 ENDTEST
 
diff --git a/src/testdir/test_autoformat_join.in b/src/testdir/test_autoformat_join.in
index f1e1c86..16fed6d 100644
--- a/src/testdir/test_autoformat_join.in
+++ b/src/testdir/test_autoformat_join.in
@@ -3,7 +3,7 @@
 STARTTEST
 :so small.vim
 :/^\t\t/
-0gqj
+0gqj:
 :let a=string(getpos("'[")).'/'.string(getpos("']"))
 :/^This line/;'}-join
 :let b=string(getpos("'[")).'/'.string(getpos("']"))
diff --git a/src/version.c b/src/version.c
index 0f48bae..e3b885e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    819,
+/**/
     818,
 /**/
     817,