patch 8.1.1181: tests for mouse clicks are a bit flaky
Problem: Tests for mouse clicks are a bit flaky when run in an interactive
terminal.
Solution: Use "xterm2" instead of "xterm" for 'ttymouse' to avoid spurious
drag events.
diff --git a/src/testdir/test_termcodes.vim b/src/testdir/test_termcodes.vim
index 578dacf..b9f7122 100644
--- a/src/testdir/test_termcodes.vim
+++ b/src/testdir/test_termcodes.vim
@@ -7,7 +7,7 @@
" Helper function to emit a terminal escape code.
func TerminalEscapeCode(code_xterm, code_sgr, row, col, m)
- if &ttymouse ==# 'xterm'
+ if &ttymouse ==# 'xterm2'
" need to use byte encoding here.
let str = list2str([a:code_xterm, a:col + 0x20, a:row + 0x20])
if has('iconv')
@@ -50,7 +50,7 @@
set mouse=a term=xterm
call setline(1, ['line 1', 'line 2', 'line 3 is a bit longer'])
- for ttymouse_val in ['xterm', 'sgr']
+ for ttymouse_val in ['xterm2', 'sgr']
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' . ttymouse_val
go
@@ -76,7 +76,7 @@
set mouse=a term=xterm
call setline(1, range(1, 100))
- for ttymouse_val in ['xterm', 'sgr']
+ for ttymouse_val in ['xterm2', 'sgr']
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' . ttymouse_val
go
@@ -112,7 +112,7 @@
let save_ttymouse = &ttymouse
set mouse=a term=xterm
- for ttymouse_val in ['xterm', 'sgr']
+ for ttymouse_val in ['xterm2', 'sgr']
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' . ttymouse_val
@@ -122,8 +122,8 @@
let row = rowseparator
let col = 1
- " When 'ttymouse' is 'xterm', row/col bigger than 223 are not supported.
- if ttymouse_val !=# 'xterm' || row <= 223
+ " When 'ttymouse' is 'xterm2', row/col bigger than 223 are not supported.
+ if ttymouse_val !=# 'xterm2' || row <= 223
call MouseLeftClick(row, col)
let row -= 1
call MouseLeftDrag(row, col)
@@ -142,8 +142,8 @@
let row = 1
let col = colseparator
- " When 'ttymouse' is 'xterm', row/col bigger than 223 are not supported.
- if ttymouse_val !=# 'xterm' || col <= 223
+ " When 'ttymouse' is 'xterm2', row/col bigger than 223 are not supported.
+ if ttymouse_val !=# 'xterm2' || col <= 223
call MouseLeftClick(row, col)
let col -= 1
call MouseLeftDrag(row, col)
@@ -169,7 +169,7 @@
let save_laststatus = &laststatus
set mouse=a term=xterm laststatus=2
- for ttymouse_val in ['xterm', 'sgr']
+ for ttymouse_val in ['xterm2', 'sgr']
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' . ttymouse_val
@@ -178,8 +178,8 @@
let row = rowstatusline
let col = 1
- if ttymouse_val ==# 'xterm' && row > 223
- " When 'ttymouse' is 'xterm', row/col bigger than 223 are not supported.
+ if ttymouse_val ==# 'xterm2' && row > 223
+ " When 'ttymouse' is 'xterm2', row/col bigger than 223 are not supported.
continue
endif
@@ -210,7 +210,7 @@
set mouse=a term=xterm
let row = 1
- for ttymouse_val in ['xterm', 'sgr']
+ for ttymouse_val in ['xterm2', 'sgr']
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' . ttymouse_val
e Xfoo
@@ -258,9 +258,9 @@
let row = 1
let col = &columns
- for ttymouse_val in ['xterm', 'sgr']
- if ttymouse_val ==# 'xterm' && col > 223
- " When 'ttymouse' is 'xterm', row/col bigger than 223 are not supported.
+ for ttymouse_val in ['xterm2', 'sgr']
+ if ttymouse_val ==# 'xterm2' && col > 223
+ " When 'ttymouse' is 'xterm2', row/col bigger than 223 are not supported.
continue
endif
let msg = 'ttymouse=' .. ttymouse_val
@@ -304,7 +304,7 @@
set mouse=a term=xterm mousetime=1
let row = 1
- for ttymouse_val in ['xterm', 'sgr']
+ for ttymouse_val in ['xterm2', 'sgr']
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' . ttymouse_val
e Xtab1
@@ -353,7 +353,7 @@
let row = 1
let col = 10
- for ttymouse_val in ['xterm', 'sgr']
+ for ttymouse_val in ['xterm2', 'sgr']
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' . ttymouse_val
e Xtab1
@@ -402,7 +402,7 @@
let save_term = &term
let save_ttymouse = &ttymouse
let save_foldcolumn = &foldcolumn
- set mouse=a term=xterm foldcolumn=3
+ set mouse=a term=xterm foldcolumn=3 ttymouse=xterm2
" Create 2 nested folds.
call setline(1, range(1, 7))
diff --git a/src/version.c b/src/version.c
index d6a3940..cef19e8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1181,
+/**/
1180,
/**/
1179,