aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.1426: Vim9: cannot call autoload function in :def function

Browse Source 
Problem:    Vim9: cannot call autoload function in :def function.
Solution:   Load the autoload script. (closes #6690)
This commit is contained in:
Bram Moolenaar
2020-08-12 15:21:22 +02:00
parent 575f24b3f3
commit a177344dc0
5 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/vim9execute.c
View File

@@ -545,6 +545,15 @@ call_ufunc(ufunc_T *ufunc, int argcount, ectx_T *ectx, isn_T *iptr)
return OK;
}
/*
* Return TRUE if an error was given or CTRL-C was pressed.
*/
static int
vim9_aborting(int prev_called_emsg)
{
return called_emsg > prev_called_emsg || got_int || did_throw;
}
/*
* Execute a function by "name".
* This can be a builtin function or a user function.
@@ -568,6 +577,18 @@ call_by_name(char_u *name, int argcount, ectx_T *ectx, isn_T *iptr)
}
ufunc = find_func(name, FALSE, NULL);
if (ufunc == NULL)
{
int called_emsg_before = called_emsg;
if (script_autoload(name, TRUE))
// loaded a package, search for the function again
ufunc = find_func(name, FALSE, NULL);
if (vim9_aborting(called_emsg_before))
return FAIL; // bail out if loading the script caused an error
}
if (ufunc != NULL)
return call_ufunc(ufunc, argcount, ectx, iptr);