From 28e60462c8668e59c9de5890852e3c28de94f255 Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Mon, 27 Apr 2015 22:08:14 -0400 Subject: vim-patch:7.4.389 based on #2429 by @Hettomei Problem: Still sometimes Vim enters Replace mode when starting up. Solution: Use a different solution in detecting the termresponse and location response. (Hayaki Saito) https://code.google.com/p/vim/source/detail?r=v7-4-389 The upstream patch touched a lot of files which don't exist in nvim, hence the small size of this commit. --- src/nvim/globals.h | 4 ---- src/nvim/version.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/nvim/globals.h b/src/nvim/globals.h index 7d1666f866..739042201f 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -1052,10 +1052,6 @@ EXTERN int typebuf_was_filled INIT(= FALSE); /* received text from client EXTERN int term_is_xterm INIT(= FALSE); /* xterm-like 'term' */ #endif -#if defined(UNIX) -EXTERN int xterm_conflict_mouse INIT(= FALSE); -#endif - #ifdef BACKSLASH_IN_FILENAME EXTERN char psepc INIT(= '\\'); /* normal path separator character */ EXTERN char psepcN INIT(= '/'); /* abnormal path separator character */ diff --git a/src/nvim/version.c b/src/nvim/version.c index 4bdd22e819..5758619b56 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -394,7 +394,7 @@ static int included_patches[] = { 392, 391, 390, - //389, + 389, 388, 387, 386, -- cgit