diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-07-09 19:20:59 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-07-09 19:20:59 +0200 |
| commit | 0d3e24be5686c0710aa3c6671e4c626d6cb21a5f (patch) | |
| tree | 5258f4e5a3549842a571617ac2016dc716db0292 | |
| parent | aa4d73235bf4deee167aa5314b89ae3d3db334b7 (diff) | |
| download | vim-git-0d3e24be5686c0710aa3c6671e4c626d6cb21a5f.tar.gz | |
patch 7.4.2012v7.4.2012
Problem: Test for getcompletion() does not pass on all systems.
Solution: Only test what is supported.
| -rw-r--r-- | src/testdir/test_cmdline.vim | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 14 insertions, 5 deletions
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim index 30d366b1e..348215323 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -26,17 +26,24 @@ func Test_complete_wildmenu() endfunc func Test_getcompletion() + if !has('cmdline_compl') + return + endif let groupcount = len(getcompletion('', 'event')) call assert_true(groupcount > 0) let matchcount = len(getcompletion('File', 'event')) call assert_true(matchcount > 0) call assert_true(groupcount > matchcount) - source $VIMRUNTIME/menu.vim - let matchcount = len(getcompletion('', 'menu')) - call assert_true(matchcount > 0) - let matchcount = len(getcompletion('ToolBar.', 'menu')) - call assert_true(matchcount > 0) + if has('menu') + source $VIMRUNTIME/menu.vim + let matchcount = len(getcompletion('', 'menu')) + call assert_true(matchcount > 0) + call assert_equal(['File.'], getcompletion('File', 'menu')) + call assert_true(matchcount > 0) + let matchcount = len(getcompletion('File.', 'menu')) + call assert_true(matchcount > 0) + endif call assert_fails('call getcompletion("", "burp")', 'E475:') endfunc diff --git a/src/version.c b/src/version.c index 33cfc5752..39331b6c1 100644 --- a/src/version.c +++ b/src/version.c @@ -759,6 +759,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2012, +/**/ 2011, /**/ 2010, |