patch 8.1.1141: terminal winpos test fails with very large terminal
Problem: Terminal winpos test fails with very large terminal. (Dominique
Pelle)
Solution: Compute the expected size more accurately. (closes #4228)
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index e6ae7e2..e337c47 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1912,9 +1912,15 @@
let ypos = str2nr(substitute(line, '\[\d\+, \(\d\+\)\]', '\1', ''))
" Position must be bigger than the getwinpos() result of Vim itself.
+ " The calcuation in the console assumes a 10 x 7 character cell.
+ " In the GUI it can be more, let's assume a 20 x 14 cell.
+ " And then add 100 / 200 tolerance.
let [xroot, yroot] = getwinpos()
- call assert_inrange(xroot + 2, xroot + 1000, xpos)
- call assert_inrange(yroot + 2, yroot + 1000, ypos)
+ let [winrow, wincol] = win_screenpos('.')
+ let xoff = wincol * (has('gui_running') ? 14 : 7) + 100
+ let yoff = winrow * (has('gui_running') ? 20 : 10) + 200
+ call assert_inrange(xroot + 2, xroot + xoff, xpos)
+ call assert_inrange(yroot + 2, yroot + yoff, ypos)
call term_wait(buf)
call term_sendkeys(buf, ":q\<CR>")
diff --git a/src/version.c b/src/version.c
index 7c3490e..4dc55f4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1141,
+/**/
1140,
/**/
1139,