diff options
| author | Scott Prager <splinterofchaos@gmail.com> | 2014-09-09 14:44:10 -0400 |
|---|---|---|
| committer | Scott Prager <splinterofchaos@gmail.com> | 2014-09-19 20:23:06 -0400 |
| commit | 3253e7ec09e8c26c31ad5d2172fd664864012f38 (patch) | |
| tree | ce906ba95f258c9c40062bf34276f6615a4137f4 /src | |
| parent | 83cd2979a10bdab903e4f3f0f5bb0c85573522b6 (diff) | |
| download | rneovim-3253e7ec09e8c26c31ad5d2172fd664864012f38.tar.gz rneovim-3253e7ec09e8c26c31ad5d2172fd664864012f38.tar.bz2 rneovim-3253e7ec09e8c26c31ad5d2172fd664864012f38.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/os_unix.c | 2 | ||||
| -rw-r--r-- | src/nvim/term.c | 12 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 14 insertions, 2 deletions
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); } diff --git a/src/nvim/term.c b/src/nvim/term.c index 7f52566c6f..263b81fc3a 100644 --- a/src/nvim/term.c +++ b/src/nvim/term.c @@ -2468,6 +2468,18 @@ bool did_request_esc_sequence(void) return crv_status == CRV_SENT || u7_status == U7_SENT || xt_index_out > xt_index_in; } + +/// If requesting the version was disabled in did_request_esc_sequence(), +/// enable it again. +void resume_get_esc_sequence(void) +{ + if (crv_status == 0) { + crv_status = CRV_GET; + } + if (u7_status == 0) { + u7_status = U7_GET; + } +} #endif /* diff --git a/src/nvim/version.c b/src/nvim/version.c index cb5b981273..df4c3bd5ce 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -236,7 +236,7 @@ static int included_patches[] = { 362, 361, //360, - //359, + 359, 358, 357, //356 NA |