summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-08-05 12:02:40 +0200
committerBram Moolenaar <Bram@vim.org>2020-08-05 12:02:40 +0200
commit14ddd226daa324831e1872c352452f202fd6068c (patch)
treefe33ee91c8fba5e486e513a6aaff7259804cdce7 /src
parentff1cd39cfe62d5089d5e703f4eb290694751ace3 (diff)
downloadvim-git-14ddd226daa324831e1872c352452f202fd6068c.tar.gz
patch 8.2.1369: MS-Windows: autocommand test sometimes failsv8.2.1369
Problem: MS-Windows: autocommand test sometimes fails. Solution: Do not rely on the cat command.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_autocmd.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 70fbe01c0..e6c7ec03c 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -1618,7 +1618,7 @@ func Test_change_mark_in_autocmds()
write
au! BufWritePre
- if executable('cat')
+ if has('unix')
write XtestFilter
write >> XtestFilter
diff --git a/src/version.c b/src/version.c
index 2609eb7e0..a0f4593b2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1369,
+/**/
1368,
/**/
1367,