diff options
| author | Michael Reed <m.reed@mykolab.com> | 2015-04-27 22:08:14 -0400 |
|---|---|---|
| committer | Michael Reed <m.reed@mykolab.com> | 2015-05-01 16:45:02 -0400 |
| commit | 28e60462c8668e59c9de5890852e3c28de94f255 (patch) | |
| tree | ff3cb89cbec60a3bb003122d91d12766aeb69b35 | |
| parent | cc76c5b0cfb6233ff36949a4422d59cd4bc6efd5 (diff) | |
| download | rneovim-28e60462c8668e59c9de5890852e3c28de94f255.tar.gz rneovim-28e60462c8668e59c9de5890852e3c28de94f255.tar.bz2 rneovim-28e60462c8668e59c9de5890852e3c28de94f255.zip | |
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.
| -rw-r--r-- | src/nvim/globals.h | 4 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 1 insertions, 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, |