summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-07-13 18:08:59 +0200
committerBram Moolenaar <Bram@vim.org>2019-07-13 18:08:59 +0200
commiteaa49e40d7e7f84deef14424c84ef1da0796fa58 (patch)
tree1d31b3b3529b1c79d6c8637728f8d7effb43e529
parenta901a37bae9f4e2848d6d7ac7b0875d72f43e1eb (diff)
patch 8.1.1679: test using SwapExists autocommand file may failv8.1.1679
Problem: Test using SwapExists autocommand file may fail. Solution: Remove the SwapExists autocommand.
-rw-r--r--src/testdir/test_window_cmd.vim2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/testdir/test_window_cmd.vim b/src/testdir/test_window_cmd.vim
index b3eecd7050..4585cd321b 100644
--- a/src/testdir/test_window_cmd.vim
+++ b/src/testdir/test_window_cmd.vim
@@ -42,6 +42,8 @@ function Test_window_cmd_wincmd_gf()
function s:swap_exists()
let v:swapchoice = s:swap_choice
endfunc
+ " Remove the catch-all that runtest.vim adds
+ au! SwapExists
augroup test_window_cmd_wincmd_gf
autocmd!
exec "autocmd SwapExists " . fname . " call s:swap_exists()"
diff --git a/src/version.c b/src/version.c
index e48dd60345..3263f696e7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1679,
+/**/
1678,
/**/
1677,