diff --git a/src/regexp_bt.c b/src/regexp_bt.c
index 70eab25b34..afea5e4cb5 100644
--- a/src/regexp_bt.c
+++ b/src/regexp_bt.c
@@ -4764,7 +4764,7 @@ regtry(
 
 /*
  * Match a regexp against a string ("line" points to the string) or multiple
- * lines ("line" is NULL, use reg_getline()).
+ * lines (if "line" is NULL, use reg_getline()).
  * Returns 0 for failure, number of lines contained in the match otherwise.
  */
     static long
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 9edca81912..a519b85374 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -7287,7 +7287,7 @@ nfa_regtry(
 
 /*
  * Match a regexp against a string ("line" points to the string) or multiple
- * lines ("line" is NULL, use reg_getline()).
+ * lines (if "line" is NULL, use reg_getline()).
  *
  * Returns <= 0 for failure, number of lines contained in the match otherwise.
  */
diff --git a/src/testdir/test_exec_while_if.vim b/src/testdir/test_exec_while_if.vim
index 2e21ba07aa..3da2784d77 100644
--- a/src/testdir/test_exec_while_if.vim
+++ b/src/testdir/test_exec_while_if.vim
@@ -1,6 +1,6 @@
-" Test for :execute, :while and :if
+" Test for :execute, :while, :for and :if
 
-function Test_exec_while_if()
+func Test_exec_while_if()
   new
 
   let i = 0
@@ -50,6 +50,6 @@ function Test_exec_while_if()
         \ "7x999999999888888887777777666666555554444333221",
         \ "8",
         \ "9x"], getline(1, 10))
-endfunction
+endfunc
 
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_substitute.vim b/src/testdir/test_substitute.vim
index f38eb55b81..4c99f81870 100644
--- a/src/testdir/test_substitute.vim
+++ b/src/testdir/test_substitute.vim
@@ -926,4 +926,13 @@ func Test_substitute_multiline_submatch()
   close!
 endfunc
 
+func Test_substitute_skipped_range()
+  new
+  if 0
+    /1/5/2/2/\n
+  endif
+  call assert_equal([0, 1, 1, 0, 1], getcurpos())
+  bwipe!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 444f35fdaa..b256620945 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2829,
 /**/
     2828,
 /**/