summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-12-02 12:30:22 +0000
committerBram Moolenaar <Bram@vim.org>2021-12-02 12:30:22 +0000
commitf8bc0ce2671d7f7f73760f665b52e4f00a1bbcac (patch)
tree4f0b745f625695e1e57fe2bda00d50c129b789e0
parent3569c0de67bc9c723621297ae827d5e3353793a1 (diff)
downloadvim-git-f8bc0ce2671d7f7f73760f665b52e4f00a1bbcac.tar.gz
patch 8.2.3719: MS-Windows: test sometimes runs into existing swap filev8.2.3719
Problem: MS-Windows: test sometimes runs into existing swap file. Solution: Use a different file name.
-rw-r--r--src/testdir/test_buffer.vim12
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 6 deletions
diff --git a/src/testdir/test_buffer.vim b/src/testdir/test_buffer.vim
index aa2fe7ac6..0d871383f 100644
--- a/src/testdir/test_buffer.vim
+++ b/src/testdir/test_buffer.vim
@@ -389,12 +389,12 @@ func Test_buffer_scheme()
set noshellslash
%bwipe!
let bufnames = [
- \ #{id: 'b0', name: 'test://xyz/foo/b0' , match: 1},
- \ #{id: 'b1', name: 'test+abc://xyz/foo/b1', match: 0},
- \ #{id: 'b2', name: 'test_abc://xyz/foo/b2', match: 0},
- \ #{id: 'b3', name: 'test-abc://xyz/foo/b3', match: 1},
- \ #{id: 'b4', name: '-test://xyz/foo/b4' , match: 0},
- \ #{id: 'b5', name: 'test-://xyz/foo/b5' , match: 0},
+ \ #{id: 'ssb0', name: 'test://xyz/foo/ssb0' , match: 1},
+ \ #{id: 'ssb1', name: 'test+abc://xyz/foo/ssb1', match: 0},
+ \ #{id: 'ssb2', name: 'test_abc://xyz/foo/ssb2', match: 0},
+ \ #{id: 'ssb3', name: 'test-abc://xyz/foo/ssb3', match: 1},
+ \ #{id: 'ssb4', name: '-test://xyz/foo/ssb4' , match: 0},
+ \ #{id: 'ssb5', name: 'test-://xyz/foo/ssb5' , match: 0},
\]
for buf in bufnames
new `=buf.name`
diff --git a/src/version.c b/src/version.c
index cf8f94550..d977c653a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3719,
+/**/
3718,
/**/
3717,