diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-09-19 20:42:03 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-09-19 20:42:03 -0400 |
| commit | 0375128377ef89d833e19a5e58a69f628a0e5d6c (patch) | |
| tree | ce906ba95f258c9c40062bf34276f6615a4137f4 /src/nvim/globals.h | |
| parent | dc6db20febf1ce1848e87f8950c48a78aaffd8f6 (diff) | |
| parent | 3253e7ec09e8c26c31ad5d2172fd664864012f38 (diff) | |
| download | rneovim-0375128377ef89d833e19a5e58a69f628a0e5d6c.tar.gz rneovim-0375128377ef89d833e19a5e58a69f628a0e5d6c.tar.bz2 rneovim-0375128377ef89d833e19a5e58a69f628a0e5d6c.zip | |
Merge pull request #1150 from splinterofchaos/vim-patch-7.4.305
Vim patch 7.4.305 + Vim patch 7.4.359
Diffstat (limited to 'src/nvim/globals.h')
| -rw-r--r-- | src/nvim/globals.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/nvim/globals.h b/src/nvim/globals.h index 674786ff08..851022cd62 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -1059,6 +1059,10 @@ 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 */ |