From 3253e7ec09e8c26c31ad5d2172fd664864012f38 Mon Sep 17 00:00:00 2001
From: Scott Prager <splinterofchaos@gmail.com>
Date: Tue, 9 Sep 2014 14:44:10 -0400
Subject: vim-patch:7.4.359

Problem:    When 'ttymouse' is set to 'uxterm' the xterm version is not
            requested. (Tomas Janousek)
Solution:   Do not mark uxterm as a conflict mouse and add
            resume_get_esc_sequence().

https://code.google.com/p/vim/source/detail?r=v7-4-359
---
 src/nvim/os_unix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/os_unix.c')

diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c
index 23dc79b896..52f57f8262 100644
--- a/src/nvim/os_unix.c
+++ b/src/nvim/os_unix.c
@@ -810,7 +810,7 @@ void check_mouse_termcode(void)
       mch_setmouse(false);
       setmouse();
     }
-    xterm_conflict_mouse = true;
+    resume_get_esc_sequence();
   } else {
     del_mouse_termcode(KS_URXVT_MOUSE);
   }
-- 
cgit