diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-04-06 22:21:22 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-04-06 22:21:22 +0200 |
| commit | 616aeef21f2abd0bc51dd98e641ade9bbc29a078 (patch) | |
| tree | 5abd62bf26aebacd0b93faa92b6febad569e55b5 | |
| parent | 16c34c37659e6afca74169969bdacb6b866548c9 (diff) | |
| download | vim-git-616aeef21f2abd0bc51dd98e641ade9bbc29a078.tar.gz | |
patch 8.1.1132: getwinpos() test fails on MS-Windowsv8.1.1132
Problem: getwinpos() test fails on MS-Windows.
Solution: Don't try running this test.
| -rw-r--r-- | src/testdir/test_terminal.vim | 19 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 11 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index cbde579c8..e6ae7e25a 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -1889,6 +1889,10 @@ func Test_terminal_statusline() endfunc func Test_terminal_getwinpos() + if !CanRunVimInTerminal() + return + endif + " split, go to the bottom-right window split wincmd j @@ -1907,17 +1911,10 @@ func Test_terminal_getwinpos() let xpos = str2nr(substitute(line, '\[\(\d\+\), \d\+\]', '\1', '')) let ypos = str2nr(substitute(line, '\[\d\+, \(\d\+\)\]', '\1', '')) - " getwinpos() in the MS-Windows console returns the screen position of the - " emulated console. - if has('win32') - call assert_inrange(0, 4000, xpos) - call assert_inrange(0, 2000, ypos) - else - " Position must be bigger than the getwinpos() result of Vim itself. - let [xroot, yroot] = getwinpos() - call assert_inrange(xroot + 2, xroot + 1000, xpos) - call assert_inrange(yroot + 2, yroot + 1000, ypos) - endif + " Position must be bigger than the getwinpos() result of Vim itself. + let [xroot, yroot] = getwinpos() + call assert_inrange(xroot + 2, xroot + 1000, xpos) + call assert_inrange(yroot + 2, yroot + 1000, ypos) call term_wait(buf) call term_sendkeys(buf, ":q\<CR>") diff --git a/src/version.c b/src/version.c index 1fa1e8e6f..47c9e3369 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 */ /**/ + 1132, +/**/ 1131, /**/ 1130, |