From ea94c855163cf58a3389b5f3c54a0767c9e1be49 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 16 Aug 2019 21:47:27 +0200
Subject: [PATCH] patch 8.1.1860: map timeout test is flaky

Problem:    Map timeout test is flaky.
Solution:   Add test to list of flaky tests.  Increase timeout.
---
 src/testdir/runtest.vim      | 1 +
 src/testdir/test_mapping.vim | 2 +-
 src/version.c                | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 32c22fa335..1df7fd96a8 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -322,6 +322,7 @@ let s:flaky_tests = [
       \ 'Test_diff_screen()',
       \ 'Test_exit_callback()',
       \ 'Test_exit_callback_interval()',
+      \ 'Test_map_timeout_with_timer_interrupt()',
       \ 'Test_nb_basic()',
       \ 'Test_open_delay()',
       \ 'Test_out_cb()',
diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
index 6b9fb9ca1a..93a4d4b857 100644
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -298,7 +298,7 @@ func Test_map_timeout_with_timer_interrupt()
   let g:val = 0
   nnoremap \12 :let g:val = 1<CR>
   nnoremap \123 :let g:val = 2<CR>
-  set timeout timeoutlen=100
+  set timeout timeoutlen=200
 
   func ExitCb(job, status)
     let g:timer = timer_start(1, {-> feedkeys("3\<Esc>", 't')})
diff --git a/src/version.c b/src/version.c
index 66bd86fc73..cf96d640fd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1860,
 /**/
     1859,
 /**/