From c29a349abf5e3f0969c01a2a5ede4b8b97c2b2f8 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sat, 6 Dec 2014 02:04:17 +0100
Subject: [PATCH] Use `<nowait>` with mappings

Fixes https://github.com/mbbill/undotree/issues/44
---
 plugin/undotree.vim | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugin/undotree.vim b/plugin/undotree.vim
index c738968..0e0cb5e 100644
--- a/plugin/undotree.vim
+++ b/plugin/undotree.vim
@@ -350,8 +350,15 @@ function! s:undotree.Init()
 endfunction
 
 function! s:undotree.BindKey()
+    if v:version > 703 || (v:version == 703 && has("patch1261"))
+        let map_options = '<nowait> '
+    else
+        let map_options = ''
+    endif
     for i in s:keymap
-        silent exec 'nnoremap <silent> <script> <buffer> '.i[1].' :call <sid>undotreeAction("'.i[0].'")<cr>'
+        silent exec 'nnoremap <silent> <script> <buffer> '
+            \ .map_options
+            \ .i[1].' :call <sid>undotreeAction("'.i[0].'")<cr>'
     endfor
     if exists('*g:Undotree_CustomMap')
         call g:Undotree_CustomMap()