changeset 14075:320956bddcef v8.1.0055

patch 8.1.0055: complete test has wrong order of arguments commit https://github.com/vim/vim/commit/52d3aaeea4c85406f46e2051729e4f007f83b35e Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jun 13 21:27:24 2018 +0200 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)
author Christian Brabandt <cb@256bit.org>
date Wed, 13 Jun 2018 21:30:06 +0200
parents ec0ce6a5f231
children c3ec29c00689
files src/mbyte.c src/testdir/test_ins_complete.vim src/version.c
diffstat 3 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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);
 }
 
--- 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\<C-X>\<C-U>\<Esc>", '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\<C-X>\<C-O>\<Esc>", '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!
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    55,
+/**/
     54,
 /**/
     53,