diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-09-05 23:29:26 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-09-05 23:29:26 +0200 |
commit | 1b0c2fcf6e85c9b85c24757ba970061e1f3e4e80 (patch) | |
tree | 992eec41bdddd3e88a6310d40ebafbaf35dd497b /src | |
parent | 31845093b7f1b33e0c7e9e592bef65528674a1f2 (diff) | |
download | vim-git-1b0c2fcf6e85c9b85c24757ba970061e1f3e4e80.tar.gz |
patch 7.4.2334v7.4.2334
Problem: On MS-Windows test_getcwd leaves Xtopdir behind.
Solution: Set 'noswapfile'. (Michael Soyka)
Diffstat (limited to 'src')
-rw-r--r-- | src/testdir/test_getcwd.in | 3 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_getcwd.in b/src/testdir/test_getcwd.in index e92ea1b8e..f62d21afa 100644 --- 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 fda0bf91e..4e76bc7b3 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2334, +/**/ 2333, /**/ 2332, |