# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1521834308 -3600
# Node ID eb960e9c75c813c82de861c4c5588ccb9665aee9
# Parent  a193655e5330eeb06e5946f1f6bb454773390a90
patch 8.0.1631: testing with Vim running in terminal is a bit flaky

commit https://github.com/vim/vim/commit/948a796bfea55d1e5a3a079d4976fdd4d093cd05
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Mar 23 20:37:45 2018 +0100

    patch 8.0.1631: testing with Vim running in terminal is a bit flaky

    Problem:    Testing with Vim running in terminal is a bit flaky.
    Solution:   Delete any .swp file so that later tests don't fail.

diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim
--- a/src/testdir/screendump.vim
+++ b/src/testdir/screendump.vim
@@ -26,6 +26,10 @@ source shared.vim
 "
 " Options is a dictionary (not used yet).
 func RunVimInTerminal(arguments, options)
+  " If Vim doesn't exit a swap file remains, causing other tests to fail.
+  " Remove it here.
+  call delete(".swp")
+
   " Make a horizontal and vertical split, so that we can get exactly the right
   " size terminal window.  Works only when we currently have one window.
   call assert_equal(1, winnr('$'))
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1631,
+/**/
     1630,
 /**/
     1629,