From 657a826c07b4ea3f8846b6acb2c50b82c2d81e50 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 15 Jul 2020 18:29:18 +0200
Subject: [PATCH] patch 8.2.1222: using valgrind in Vim command started by test
 doesn't work

Problem:    When using valgrind a Vim command started by a test uses the same
            log file name which gets overwritten.
Solution:   Fix regexp to rename the log file.
---
 src/testdir/shared.vim | 2 +-
 src/version.c          | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim
index bbd28be1c..c7dd41f20 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 f0cfe69a3..558a73e84 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,
 /**/
-- 
2.40.0