aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-09 06:14:17 -04:00
Code Activity

patch 8.2.3838: cannot use script-local function for setting *func options

Browse Source 
Problem:    Cannot use script-local function for setting *func options.
Solution:   Use the script context. (Yegappan Lakshmanan, closes #9362)
This commit is contained in:
Yegappan Lakshmanan
2021-12-17 16:21:20 +00:00
committed by Bram Moolenaar
parent d2ff705af3
commit db1a410b61
7 changed files with 282 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/option.c
View File

@@ -7199,17 +7199,39 @@ option_set_callback_func(char_u *optval UNUSED, callback_T *optcb UNUSED)
return OK;
}
if (STRNCMP(optval, "s:", 2) == 0 && !SCRIPT_ID_VALID(current_sctx.sc_sid))
return FAIL;
if (*optval == '{' || (in_vim9script() && *optval == '(')
|| (STRNCMP(optval, "function(", 9) == 0)
|| (STRNCMP(optval, "funcref(", 8) == 0))
// Lambda expression or a funcref
tv = eval_expr(optval, NULL);
else
{
// treat everything else as a function name string
tv = alloc_string_tv(vim_strsave(optval));
// Function name starting with "s:" are supported only in a vimscript
// context.
if (STRNCMP(optval, "s:", 2) == 0)
{
char sid_buf[25];
char_u *funcname;
if (!SCRIPT_ID_VALID(current_sctx.sc_sid))
{
emsg(_(e_using_sid_not_in_script_context));
return FAIL;
}
// Expand s: prefix into <SNR>nr_<name>
sprintf(sid_buf, "<SNR>%ld_", (long)current_sctx.sc_sid);
funcname = alloc(STRLEN(sid_buf) + STRLEN(optval + 2) + 1);
if (funcname == NULL)
return FAIL;
STRCPY(funcname, sid_buf);
STRCAT(funcname, optval + 2);
tv = alloc_string_tv(funcname);
}
else
tv = alloc_string_tv(vim_strsave(optval));
}
if (tv == NULL)
return FAIL;