# HG changeset patch # User Christian Brabandt # Date 1468085405 -7200 # Node ID 7384c0cfad1375ddf18a8af38160f899574055a5 # Parent 51320e7fa2f8ebd0eeada450c9b1ea35f598c413 commit https://github.com/vim/vim/commit/0d3e24be5686c0710aa3c6671e4c626d6cb21a5f Author: Bram Moolenaar Date: Sat Jul 9 19:20:59 2016 +0200 patch 7.4.2012 Problem: Test for getcompletion() does not pass on all systems. Solution: Only test what is supported. diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim --- 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 --- 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,