changeset 22944:815f3a6b05ca v8.2.2019

patch 8.2.2019: swap file test fails on MS-Windows Commit: https://github.com/vim/vim/commit/80d868ec25094615f2531a1e01ed1e729366c3bc Author: Bram Moolenaar <Bram@vim.org> Date: Fri Nov 20 09:10:15 2020 +0100 patch 8.2.2019: swap file test fails on MS-Windows Problem: Swap file test fails on MS-Windows. Solution: Add four to the process ID. (Ken Takata, closes https://github.com/vim/vim/issues/7333)
author Bram Moolenaar <Bram@vim.org>
date Fri, 20 Nov 2020 09:15:04 +0100
parents d2e9a645b92d
children a058f2c5ce98
files src/testdir/test_swap.vim src/version.c
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,