patch 7.4.2334

Problem:    On MS-Windows test_getcwd leaves Xtopdir behind.
Solution:   Set 'noswapfile'. (Michael Soyka)

diff --git a/src/testdir/test_getcwd.in b/src/testdir/test_getcwd.in
index e92ea1b8e0cf7b09f3f1c60a50b7da77cfc7467a..f62d21afa1f26029e82186ddbee80c5ec70a9c83 100644 (file)
--- a/src/testdir/test_getcwd.in
+++ b/src/testdir/test_getcwd.in
@@ -9,6 +9,9 @@ STARTTEST
 :set visualbell
 :set nocp viminfo+=nviminfo
 :"
+:" On windows a swapfile in Xtopdir prevents it from being cleaned up.
+:set noswapfile
+:"
 :function! GetCwdInfo(win, tab)
 : let tab_changed = 0
 : let mod = ":t"

diff --git a/src/version.c b/src/version.c
index fda0bf91e20577f8c4e00dfbe4cff3a2f83cd903..4e76bc7b3a60ce184f5bfa81eb0ef7a3b9a2253a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2334,
 /**/
     2333,
 /**/