summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-11-12 16:09:54 +0000
committerBram Moolenaar <Bram@vim.org>2021-11-12 16:09:54 +0000
commit0a15c7676bccb0c9483579106318e785c6e40a7f (patch)
treea6f77587b0937668bed3005827eaa4158973ecfb
parent326e7da609a1b115b0ed535e89e970afebe99e35 (diff)
downloadvim-git-8.2.3587.tar.gz
patch 8.2.3587: compiler test fails with backslash file separatorv8.2.3587
Problem: Compiler test fails with backslash file separator. Solution: Accept slash and backslash.
-rw-r--r--src/testdir/test_compiler.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_compiler.vim b/src/testdir/test_compiler.vim
index 09c03f7f2..781bac67a 100644
--- a/src/testdir/test_compiler.vim
+++ b/src/testdir/test_compiler.vim
@@ -22,7 +22,7 @@ func Test_compiler()
call assert_fails('let g:current_compiler', 'E121:')
let verbose_efm = execute('verbose set efm')
- call assert_match('Last set from .*/compiler/perl.vim ', verbose_efm)
+ call assert_match('Last set from .*[/\\]compiler[/\\]perl.vim ', verbose_efm)
call setline(1, ['#!/usr/bin/perl -w', 'use strict;', 'my $foo=1'])
w!
diff --git a/src/version.c b/src/version.c
index 040fbb649..65d9d10f6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3587,
+/**/
3586,
/**/
3585,