From b7637c44c26b057d1f3721d932bbab06d9f74393 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 23 Apr 2017 18:49:36 +0200
Subject: patch 8.0.0586: no test for mapping timing out

Problem:    No test for mapping timing out.
Solution:   Add a test.
---
 src/testdir/test_mapping.vim | 27 +++++++++++++++++++++++++++
 src/version.c                |  2 ++
 2 files changed, 29 insertions(+)

diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
index ab02a87e1..5026d6b2b 100644
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -171,3 +171,30 @@ func Test_abbr_after_line_join()
   unabbr foo
   set backspace&
 endfunc
+
+func Test_map_timeout()
+  nnoremap aaaa :let got_aaaa = 1<CR>
+  nnoremap bb :let got_bb = 1<CR>
+  nmap b aaa
+  new
+  func ExitInsert(timer)
+    let g:line = getline(1)
+    call feedkeys("\<Esc>", "t")
+  endfunc
+  set timeout timeoutlen=200
+  call timer_start(300, 'ExitInsert')
+  " After the 'b' Vim waits for another character to see if it matches 'bb'.
+  " When it times out it is expanded to "aaa", but there is no wait for
+  " "aaaa".  Can't check that reliably though.
+  call feedkeys("b", "xt!")
+  call assert_equal("aa", g:line)
+  call assert_false(exists('got_aaa'))
+  call assert_false(exists('got_bb'))
+
+  bwipe!
+  nunmap aaaa
+  nunmap bb
+  nunmap b
+  set timeoutlen&
+  delfunc ExitInsert
+endfunc
diff --git a/src/version.c b/src/version.c
index 47dd973b0..3e683e80f 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 */
+/**/
+    586,
 /**/
     585,
 /**/
-- 
cgit v1.2.1