diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-05-08 17:58:15 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-05-08 17:58:15 +0200 |
| commit | 240f7abab01b5e3fd5336dd780e42501ec3f2fcb (patch) | |
| tree | 9a642b27b840877eed32d76250636af375f87cf4 | |
| parent | 27821260c0afaac85cb1c10627f1d7fbe48860ae (diff) | |
patch 8.1.1297: invalid argument test fails without GTKv8.1.1297
Problem: Invalid argument test fails without GTK.
Solution: Test -display and --display separately.
| -rw-r--r-- | src/testdir/test_startup.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim index a45130f7a7..61c508275c 100644 --- a/src/testdir/test_startup.vim +++ b/src/testdir/test_startup.vim @@ -422,7 +422,7 @@ func Test_invalid_args() endfor endif - if has('clipboard') + if has('gui_gtk') let out = split(system(GetVimCommand() .. ' --display'), "\n") call assert_equal(1, v:shell_error) call assert_match('^VIM - Vi IMproved .* (.*)$', out[0]) @@ -430,6 +430,14 @@ func Test_invalid_args() call assert_equal('More info with: "vim -h"', out[2]) endif + if has('clipboard') + let out = split(system(GetVimCommand() .. ' -display'), "\n") + call assert_equal(1, v:shell_error) + call assert_match('^VIM - Vi IMproved .* (.*)$', out[0]) + call assert_equal('Argument missing after: "-display"', out[1]) + call assert_equal('More info with: "vim -h"', out[2]) + endif + let out = split(system(GetVimCommand() .. ' -ix'), "\n") call assert_equal(1, v:shell_error) call assert_match('^VIM - Vi IMproved .* (.*)$', out[0]) diff --git a/src/version.c b/src/version.c index 8e6b404f8b..da0d1dfabb 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1297, +/**/ 1296, /**/ 1295, |