From b48108d58ea30ba72b635af6ae8d888e7f0fe223 Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Sun, 15 Dec 2024 10:38:57 +0100 Subject: [PATCH] patch 9.1.0928: tests: test_popupwin fails because the filter command fails Problem: tests: test_popupwin fails because the filter command fails Solution: add the "e" flag to the :s command to normalize the screendumps Last Change header so that it doesn't fail on "Pattern not found" The test might still fail, because the "Last Change" hader should always be part of the screendump, but at least the filter command should not cause aborting of the test script. Signed-off-by: Christian Brabandt --- src/testdir/dumps/Test_popup_setbuf_04.vim | 2 +- src/testdir/dumps/Test_popup_setbuf_05.vim | 2 +- src/testdir/dumps/Test_popup_setbuf_06.vim | 2 +- src/version.c | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/testdir/dumps/Test_popup_setbuf_04.vim b/src/testdir/dumps/Test_popup_setbuf_04.vim index f55dbf30d8..b0e9be872b 100644 --- a/src/testdir/dumps/Test_popup_setbuf_04.vim +++ b/src/testdir/dumps/Test_popup_setbuf_04.vim @@ -1,2 +1,2 @@ " replace Last Change Header in help.txt -:1s/|L|a|s|t| |c|h|a|n|g|e|:| |\d|\d|\d|\d| |\w|\w|\w| |\d|\d|/|L|a|s|t| |c|h|a|n|g|e|:| |2|0|2|4| |M|a|y| |2|7|/g +:1s/|L|a|s|t| |c|h|a|n|g|e|:| |\d|\d|\d|\d| |\w|\w|\w| |\d|\d|/|L|a|s|t| |c|h|a|n|g|e|:| |2|0|2|4| |M|a|y| |2|7|/ge diff --git a/src/testdir/dumps/Test_popup_setbuf_05.vim b/src/testdir/dumps/Test_popup_setbuf_05.vim index f55dbf30d8..b0e9be872b 100644 --- a/src/testdir/dumps/Test_popup_setbuf_05.vim +++ b/src/testdir/dumps/Test_popup_setbuf_05.vim @@ -1,2 +1,2 @@ " replace Last Change Header in help.txt -:1s/|L|a|s|t| |c|h|a|n|g|e|:| |\d|\d|\d|\d| |\w|\w|\w| |\d|\d|/|L|a|s|t| |c|h|a|n|g|e|:| |2|0|2|4| |M|a|y| |2|7|/g +:1s/|L|a|s|t| |c|h|a|n|g|e|:| |\d|\d|\d|\d| |\w|\w|\w| |\d|\d|/|L|a|s|t| |c|h|a|n|g|e|:| |2|0|2|4| |M|a|y| |2|7|/ge diff --git a/src/testdir/dumps/Test_popup_setbuf_06.vim b/src/testdir/dumps/Test_popup_setbuf_06.vim index f55dbf30d8..b0e9be872b 100644 --- a/src/testdir/dumps/Test_popup_setbuf_06.vim +++ b/src/testdir/dumps/Test_popup_setbuf_06.vim @@ -1,2 +1,2 @@ " replace Last Change Header in help.txt -:1s/|L|a|s|t| |c|h|a|n|g|e|:| |\d|\d|\d|\d| |\w|\w|\w| |\d|\d|/|L|a|s|t| |c|h|a|n|g|e|:| |2|0|2|4| |M|a|y| |2|7|/g +:1s/|L|a|s|t| |c|h|a|n|g|e|:| |\d|\d|\d|\d| |\w|\w|\w| |\d|\d|/|L|a|s|t| |c|h|a|n|g|e|:| |2|0|2|4| |M|a|y| |2|7|/ge diff --git a/src/version.c b/src/version.c index 6166ce6e16..e795be6d33 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 */ +/**/ + 928, /**/ 927, /**/ -- 2.47.2