Mercurial > vim
diff src/evalvars.c @ 26528:4d8226001391 v8.2.3793
patch 8.2.3793: using "g:Func" as a funcref does not work in script context
Commit: https://github.com/vim/vim/commit/ef082e12df2cafe177b2ac9f6922393223ccf83b
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Dec 12 21:02:03 2021 +0000
patch 8.2.3793: using "g:Func" as a funcref does not work in script context
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 12 Dec 2021 22:15:03 +0100 |
| parents | 13ba00ef7687 |
| children | fac6673086df |
line wrap: on
line diff
--- a/src/evalvars.c +++ b/src/evalvars.c @@ -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); }