diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-07-29 20:43:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-29 20:43:44 +0200 |
| commit | 6e03f87e0991b5b0dfffa79ae580b87e40468da1 (patch) | |
| tree | 0514932adfe6a8404373ab0193816af7be5e0d67 /src/nvim/edit.c | |
| parent | 454902d66341e3d106418d416540b74d229f258c (diff) | |
| parent | ea14d8d4936283cc84fc5c939032d8eeb3a7a805 (diff) | |
| download | rneovim-6e03f87e0991b5b0dfffa79ae580b87e40468da1.tar.gz rneovim-6e03f87e0991b5b0dfffa79ae580b87e40468da1.tar.bz2 rneovim-6e03f87e0991b5b0dfffa79ae580b87e40468da1.zip | |
Merge #10615 'vim-patch:8.1.0053'
fix #10604
Diffstat (limited to 'src/nvim/edit.c')
| -rw-r--r-- | src/nvim/edit.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 06f8cc9413..5a9549cc89 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -3695,14 +3695,19 @@ expand_by_function ( return; // Call 'completefunc' to obtain the list of matches. - const char_u *const args[2] = { (char_u *)"0", base }; + typval_T args[3]; + args[0].v_type = VAR_NUMBER; + args[1].v_type = VAR_STRING; + args[2].v_type = VAR_UNKNOWN; + args[0].vval.v_number = 0; + args[1].vval.v_string = base != NULL ? base : (char_u *)""; pos = curwin->w_cursor; curwin_save = curwin; curbuf_save = curbuf; - /* Call a function, which returns a list or dict. */ - if (call_vim_function(funcname, 2, args, FALSE, FALSE, &rettv) == OK) { + // Call a function, which returns a list or dict. + if (call_vim_function(funcname, 2, args, &rettv, false) == OK) { switch (rettv.v_type) { case VAR_LIST: matchlist = rettv.vval.v_list; @@ -4905,7 +4910,13 @@ static int ins_complete(int c, bool enable_pum) return FAIL; } - const char_u *const args[2] = { (char_u *)"1", NULL }; + typval_T args[3]; + args[0].v_type = VAR_NUMBER; + args[1].v_type = VAR_STRING; + args[2].v_type = VAR_UNKNOWN; + args[0].vval.v_number = 1; + args[1].vval.v_string = (char_u *)""; + pos = curwin->w_cursor; curwin_save = curwin; curbuf_save = curbuf; |