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 #7333)

diff --git a/src/testdir/test_swap.vim b/src/testdir/test_swap.vim
index 4bc73097c886fcafd8ab7efe6e254e31b187c8e9..54ba7342c7aa306c260e9e355aef700e78fe5240 100644 (file)
--- 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 ebfe94c6d7c0df7253ac37c8c56bc22cf729f64c..70ebd9c18d40c4888d39fc820347f5216d5a7a38 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2019,
 /**/
     2018,
 /**/