diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-01-23 14:17:28 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-01-23 14:17:28 +0000 |
| commit | f4e88f2152c5975a6f4cfa7ccd745575fe4d1c78 (patch) | |
| tree | 80ce52cd0d1ce029cba5689d29b954080083ec31 /src/evalvars.c | |
| parent | 7ef4a2fe3736bbeb5bad182782a74576aa06b0db (diff) | |
patch 8.2.4193: cannot use an import in 'charconvert'v8.2.4193
Problem: Cannot use an import in 'charconvert'.
Solution: Set the script context when evaluating 'charconvert'. Also expand
script-local functions in 'charconvert'.
Diffstat (limited to 'src/evalvars.c')
| -rw-r--r-- | src/evalvars.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/evalvars.c b/src/evalvars.c index 196d4d4229..305ffe5488 100644 --- a/src/evalvars.c +++ b/src/evalvars.c @@ -369,17 +369,25 @@ eval_charconvert( char_u *fname_to) { int err = FALSE; + sctx_T saved_sctx = current_sctx; + sctx_T *ctx; set_vim_var_string(VV_CC_FROM, enc_from, -1); set_vim_var_string(VV_CC_TO, enc_to, -1); set_vim_var_string(VV_FNAME_IN, fname_from, -1); set_vim_var_string(VV_FNAME_OUT, fname_to, -1); + ctx = get_option_sctx("charconvert"); + if (ctx != NULL) + current_sctx = *ctx; + if (eval_to_bool(p_ccv, &err, NULL, FALSE)) err = TRUE; + set_vim_var_string(VV_CC_FROM, NULL, -1); set_vim_var_string(VV_CC_TO, NULL, -1); set_vim_var_string(VV_FNAME_IN, NULL, -1); set_vim_var_string(VV_FNAME_OUT, NULL, -1); + current_sctx = saved_sctx; if (err) return FAIL; |