summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-12-30 14:59:23 +0100
committerBram Moolenaar <Bram@vim.org>2020-12-30 14:59:23 +0100
commit2a5c61a0196d2d67313f5b3189974211e6f33562 (patch)
treeafd850fd39ec59ab94c1e61e5290a804dbd9dc1c
parent2808da39f9aad674d25df784da636e42372b78e3 (diff)
downloadvim-git-2a5c61a0196d2d67313f5b3189974211e6f33562.tar.gz
patch 8.2.2249: termcodes test is flaky when used over sshv8.2.2249
Problem: Termcodes test is flaky when used over ssh with X forwarding. Solution: Set 'mousetime' to a larger value. (Dominique Pellé, closes #7576, closes #7563)
-rw-r--r--src/testdir/test_termcodes.vim5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/testdir/test_termcodes.vim b/src/testdir/test_termcodes.vim
index ec0208645..055ed8b65 100644
--- a/src/testdir/test_termcodes.vim
+++ b/src/testdir/test_termcodes.vim
@@ -851,7 +851,10 @@ func Test_term_mouse_multiple_clicks_to_visually_select()
let save_term = &term
let save_ttymouse = &ttymouse
call test_override('no_query_mouse', 1)
- set mouse=a term=xterm mousetime=200
+
+ " 'mousetime' must be sufficiently large, or else the test is flaky when
+ " using a ssh connection with X forwarding; i.e. ssh -X (issue #7563).
+ set mouse=a term=xterm mousetime=600
new
for ttymouse_val in g:Ttymouse_values + g:Ttymouse_dec
diff --git a/src/version.c b/src/version.c
index 4e30cdafb..d78ef0f22 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2249,
+/**/
2248,
/**/
2247,