From 0fdf2ece4f9fc74fcbb7bab6685bce152ca0f0e1 Mon Sep 17 00:00:00 2001
From: lacygoill <lacygoill@users.noreply.github.com>
Date: Sun, 5 May 2019 07:05:11 +0200
Subject: [PATCH] Prioritize local mappings over global ones (#1049)

If the user has a global mapping which begins like a local one,
they probably expect the local mapping to win.
Without `<nowait>`, they would have to wait for the timeout to occur.
---
 pythonx/UltiSnips/snippet_manager.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pythonx/UltiSnips/snippet_manager.py b/pythonx/UltiSnips/snippet_manager.py
index 293b70d..2d8b445 100644
--- a/pythonx/UltiSnips/snippet_manager.py
+++ b/pythonx/UltiSnips/snippet_manager.py
@@ -345,13 +345,13 @@ class SnippetManager(object):
         if self._inner_state_up:
             return
         if self.expand_trigger != self.forward_trigger:
-            _vim.command('inoremap <buffer> <silent> ' + self.forward_trigger +
+            _vim.command('inoremap <buffer><nowait><silent> ' + self.forward_trigger +
                          ' <C-R>=UltiSnips#JumpForwards()<cr>')
-            _vim.command('snoremap <buffer> <silent> ' + self.forward_trigger +
+            _vim.command('snoremap <buffer><nowait><silent> ' + self.forward_trigger +
                          ' <Esc>:call UltiSnips#JumpForwards()<cr>')
-        _vim.command('inoremap <buffer> <silent> ' + self.backward_trigger +
+        _vim.command('inoremap <buffer><nowait><silent> ' + self.backward_trigger +
                      ' <C-R>=UltiSnips#JumpBackwards()<cr>')
-        _vim.command('snoremap <buffer> <silent> ' + self.backward_trigger +
+        _vim.command('snoremap <buffer><nowait><silent> ' + self.backward_trigger +
                      ' <Esc>:call UltiSnips#JumpBackwards()<cr>')
 
         # Setup the autogroups.