aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 8.2.3793: using "g:Func" as a funcref does not work in script context

Browse Source 
Problem:    Using "g:Func" as a funcref does not work in script context
            because "g:" is dropped.
Solution:   Keep "g:" in the name.  Also add parenthesis to avoid confusing
            operator prececence. (closes #9336)
This commit is contained in:
Bram Moolenaar
2021-12-12 21:02:03 +00:00
parent 04ef1fb13d
commit ef082e12df
3 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/evalvars.c
View File

@@ -1414,7 +1414,7 @@ ex_let_option(
n = (long)tv_get_number(tv);
}
if (opt_p_flags & P_FUNC && (tv->v_type == VAR_PARTIAL
if ((opt_p_flags & P_FUNC) && (tv->v_type == VAR_PARTIAL
|| tv->v_type == VAR_FUNC))
{
// If the option can be set to a function reference or a lambda
@@ -2723,7 +2723,12 @@ eval_variable(
if (rettv != NULL)
{
rettv->v_type = VAR_FUNC;
rettv->vval.v_string = vim_strsave(ufunc->uf_name);
if (STRNCMP(name, "g:", 2) == 0)
// Keep the "g:", otherwise script-local may be
// assumed.
rettv->vval.v_string = vim_strsave(name);
else
rettv->vval.v_string = vim_strsave(ufunc->uf_name);
if (rettv->vval.v_string != NULL)
func_ref(ufunc->uf_name);
}