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 <cb@256bit.org>

diff --git a/src/testdir/dumps/Test_popup_setbuf_04.vim b/src/testdir/dumps/Test_popup_setbuf_04.vim
index f55dbf30d8a8de620379131baf26f1a782cc3a09..b0e9be872b78e3f8ddbc8b6572588fcfc25899ae 100644 (file)
--- 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 f55dbf30d8a8de620379131baf26f1a782cc3a09..b0e9be872b78e3f8ddbc8b6572588fcfc25899ae 100644 (file)
--- 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 f55dbf30d8a8de620379131baf26f1a782cc3a09..b0e9be872b78e3f8ddbc8b6572588fcfc25899ae 100644 (file)
--- 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 6166ce6e16f7ab1963897a31a5425b215de93365..e795be6d33d06241ed6c4f062fa82d65a14a7a15 100644 (file)
--- 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,
 /**/