summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/testdir/runtest.vim9
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 6c42616c5f..93acf99587 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -368,7 +368,14 @@ func RunTheTest(test)
" buffer, continue until we end up in an empty no-name buffer without a swap
" file.
while bufname() != '' || execute('swapname') !~ 'No swap file'
- bwipe!
+ let bn = bufnr()
+
+ noswapfile bwipe!
+
+ if bn == bufnr()
+ " avoid getting stuck in the same buffer
+ break
+ endif
endwhile
" Check if the test has left any swap files behind. Delete them before
diff --git a/src/version.c b/src/version.c
index 48bec3d9a9..99f8b66f16 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1012,
+/**/
1011,
/**/
1010,