summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-04-12 21:42:52 +0200
committerBram Moolenaar <Bram@vim.org>2019-04-12 21:42:52 +0200
commitc8b3ddab51cd2901d5946949d02c96e1035b25c0 (patch)
tree231d0229a007dd026016e824fc996001d62ad827
parenta8d22e3a40483cd1fa9c6e45dcf383f49f16833a (diff)
downloadvim-git-c8b3ddab51cd2901d5946949d02c96e1035b25c0.tar.gz
patch 8.1.1160: termcodes test would fail in a very big terminalv8.1.1160
Problem: Termcodes test would fail in a very big terminal. Solution: Bail out when the row is larger than what will work. (Dominique Pelle, closes #4246)
-rw-r--r--src/testdir/test_termcodes.vim12
-rw-r--r--src/version.c2
2 files changed, 14 insertions, 0 deletions
diff --git a/src/testdir/test_termcodes.vim b/src/testdir/test_termcodes.vim
index 633e0216f..949fa9481 100644
--- a/src/testdir/test_termcodes.vim
+++ b/src/testdir/test_termcodes.vim
@@ -118,6 +118,12 @@ func Test_xterm_mouse_drag_window_separator()
let rowseparator = winheight(0) + 1
let row = rowseparator
let col = 1
+
+ if ttymouse_val ==# 'xterm' && row > 223
+ " When 'ttymouse' is 'xterm', row/col bigger than 223 are not supported.
+ continue
+ endif
+
call MouseLeftClick(row, col)
let row -= 1
@@ -168,6 +174,12 @@ func Test_xterm_mouse_drag_statusline()
let rowstatusline = winheight(0) + 1
let row = rowstatusline
let col = 1
+
+ if ttymouse_val ==# 'xterm' && row > 223
+ " When 'ttymouse' is 'xterm', row/col bigger than 223 are not supported.
+ continue
+ endif
+
call MouseLeftClick(row, col)
let row -= 1
call MouseLeftDrag(row, col)
diff --git a/src/version.c b/src/version.c
index 46341eeb2..81f0420b9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1160,
+/**/
1159,
/**/
1158,