summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-05-03 17:55:32 +0200
committerBram Moolenaar <Bram@vim.org>2020-05-03 17:55:32 +0200
commit7779ee30d912e9dd5bd2371f8b27057bd249d53c (patch)
tree3b32cdf95491569f4b6a133dbe8c50c3a922d7ad
parent5125874951669944a5f6a4163d6e5d437ae6321e (diff)
downloadvim-git-7779ee30d912e9dd5bd2371f8b27057bd249d53c.tar.gz
patch 8.2.0691: startup test failsv8.2.0691
Problem: Startup test fails. Solution: Adjust expected output from -V2 argument.
-rw-r--r--src/testdir/test_startup.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index 5eff1bdf3..ff3510ef6 100644
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -274,7 +274,7 @@ func Test_V_arg()
call assert_equal(" verbose=0\n", out)
let out = system(GetVimCommand() . ' --clean -es -X -V2 -c "set verbose?" -cq')
- call assert_match("sourcing \"$VIMRUNTIME[\\/]defaults\.vim\"\r\nSearching for \"filetype\.vim\".*\n", out)
+ call assert_match("sourcing \"$VIMRUNTIME[\\/]defaults\.vim\"\r\nline \\d\\+: sourcing \"[\\./]*runtime[\\/]filetype\.vim\".*\n", out)
call assert_match(" verbose=2\n", out)
let out = system(GetVimCommand() . ' --clean -es -X -V15 -c "set verbose?" -cq')
diff --git a/src/version.c b/src/version.c
index 6dc86b964..abfade87d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 691,
+/**/
690,
/**/
689,