diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim index bbd28be1cc..c7dd41f20f 100644 --- a/src/testdir/shared.vim +++ b/src/testdir/shared.vim @@ -268,7 +268,7 @@ func GetVimCommand(...) " If using valgrind, make sure every run uses a different log file. if cmd =~ 'valgrind.*--log-file=' - let cmd = substitute(cmd, '--log-file=\(^\s*\)', '--log-file=\1.' . g:valgrind_cnt, '') + let cmd = substitute(cmd, '--log-file=\(\S*\)', '--log-file=\1.' . g:valgrind_cnt, '') let g:valgrind_cnt += 1 endif diff --git a/src/version.c b/src/version.c index f0cfe69a31..558a73e848 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1222, /**/ 1221, /**/