diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-11-20 09:10:15 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-11-20 09:10:15 +0100 |
| commit | 80d868ec25094615f2531a1e01ed1e729366c3bc (patch) | |
| tree | e7455bc1b63e6b134043965f78ef79a0a2345156 | |
| parent | 2ea95b61f4bec9b71cf916eebe8d11abc76617a0 (diff) | |
patch 8.2.2019: swap file test fails on MS-Windowsv8.2.2019
Problem: Swap file test fails on MS-Windows.
Solution: Add four to the process ID. (Ken Takata, closes #7333)
| -rw-r--r-- | src/testdir/test_swap.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/testdir/test_swap.vim b/src/testdir/test_swap.vim index 4bc73097c8..54ba7342c7 100644 --- a/src/testdir/test_swap.vim +++ b/src/testdir/test_swap.vim @@ -416,8 +416,9 @@ func Test_swap_auto_delete() " Forget about the file, recreate the swap file, then edit it again. The " swap file should be automatically deleted. bwipe! - " change the process ID to avoid the "still running" warning - let swapfile_bytes[24] = swapfile_bytes[24] + 1 + " Change the process ID to avoid the "still running" warning. Must add four + " for MS-Windows to see it as a different one. + let swapfile_bytes[24] = swapfile_bytes[24] + 4 call writefile(swapfile_bytes, swapfile_name) edit Xtest.scr " will end up using the same swap file after deleting the existing one diff --git a/src/version.c b/src/version.c index ebfe94c6d7..70ebd9c18d 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2019, +/**/ 2018, /**/ 2017, |