From 52d3aaeea4c85406f46e2051729e4f007f83b35e Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 13 Jun 2018 21:27:24 +0200 Subject: [PATCH] patch 8.1.0055: complete test has wrong order of arguments Problem: Complete test has wrong order of arguments. Wrong type for sentinel variable. Solution: Swap arguments, use VAR_UNKNOWN. (Ozaki Kiichi) --- src/mbyte.c | 2 +- src/testdir/test_ins_complete.vim | 8 ++++---- src/version.c | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/mbyte.c b/src/mbyte.c index 545a40db0..044312288 100644 --- a/src/mbyte.c +++ b/src/mbyte.c @@ -4799,7 +4799,7 @@ call_imactivatefunc(int active) argv[0].v_type = VAR_NUMBER; argv[0].vval.v_number = active ? 1 : 0; - argv[1].v_type = VAR_NUMBER; + argv[1].v_type = VAR_UNKNOWN; (void)call_func_retnr(p_imaf, 1, argv, FALSE); } diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim index 2b4356ea3..2cd29b575 100644 --- a/src/testdir/test_ins_complete.vim +++ b/src/testdir/test_ins_complete.vim @@ -126,15 +126,15 @@ func Test_completefunc_args() set completefunc=CompleteFunc call feedkeys("i\\\", 'x') - call assert_equal(s:args[0], [1, 1]) - call assert_equal(s:args[1][0], 0) + call assert_equal([1, 1], s:args[0]) + call assert_equal(0, s:args[1][0]) set completefunc= let s:args = [] set omnifunc=CompleteFunc call feedkeys("i\\\", 'x') - call assert_equal(s:args[0], [1, 1]) - call assert_equal(s:args[1][0], 0) + call assert_equal([1, 1], s:args[0]) + call assert_equal(0, s:args[1][0]) set omnifunc= bwipe! diff --git a/src/version.c b/src/version.c index 90ec0e414..8d5864903 100644 --- a/src/version.c +++ b/src/version.c @@ -761,6 +761,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 55, /**/ 54, /**/ -- 2.40.0