updated for version 7.4.265
Problem: Can't call a global function with "g:" in an expression.
Solution: Skip the "g:" when looking up the function.
diff --git a/src/eval.c b/src/eval.c
index d0b58ea..f915789 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -8485,33 +8485,39 @@
/* execute the function if no errors detected and executing */
if (evaluate && error == ERROR_NONE)
{
+ char_u *rfname = fname;
+
+ /* Ignore "g:" before a function name. */
+ if (fname[0] == 'g' && fname[1] == ':')
+ rfname = fname + 2;
+
rettv->v_type = VAR_NUMBER; /* default rettv is number zero */
rettv->vval.v_number = 0;
error = ERROR_UNKNOWN;
- if (!builtin_function(fname, -1))
+ if (!builtin_function(rfname, -1))
{
/*
* User defined function.
*/
- fp = find_func(fname);
+ fp = find_func(rfname);
#ifdef FEAT_AUTOCMD
/* Trigger FuncUndefined event, may load the function. */
if (fp == NULL
&& apply_autocmds(EVENT_FUNCUNDEFINED,
- fname, fname, TRUE, NULL)
+ rfname, rfname, TRUE, NULL)
&& !aborting())
{
/* executed an autocommand, search for the function again */
- fp = find_func(fname);
+ fp = find_func(rfname);
}
#endif
/* Try loading a package. */
- if (fp == NULL && script_autoload(fname, TRUE) && !aborting())
+ if (fp == NULL && script_autoload(rfname, TRUE) && !aborting())
{
/* loaded a package, search for the function again */
- fp = find_func(fname);
+ fp = find_func(rfname);
}
if (fp != NULL)