comparison src/optionstr.c @ 27330:aeadf4315bef v8.2.4193

patch 8.2.4193: cannot use an import in 'charconvert' Commit: https://github.com/vim/vim/commit/f4e88f2152c5975a6f4cfa7ccd745575fe4d1c78 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jan 23 14:17:28 2022 +0000 patch 8.2.4193: cannot use an import in 'charconvert' Problem: Cannot use an import in 'charconvert'. Solution: Set the script context when evaluating 'charconvert'. Also expand script-local functions in 'charconvert'.
author Bram Moolenaar <Bram@vim.org>
date Sun, 23 Jan 2022 15:30:03 +0100
parents 268f6a3511df
children 41e0dcf38521
comparison
equal deleted inserted replaced
27329:10ee4c6ab635 27330:aeadf4315bef
2327 varp == &p_pex || 2327 varp == &p_pex ||
2328 # endif 2328 # endif
2329 # ifdef FEAT_POSTSCRIPT 2329 # ifdef FEAT_POSTSCRIPT
2330 varp == &p_pexpr || 2330 varp == &p_pexpr ||
2331 # endif 2331 # endif
2332 FALSE 2332 varp == &p_ccv)
2333 )
2334 { 2333 {
2335 char_u **p_opt = NULL; 2334 char_u **p_opt = NULL;
2336 char_u *name; 2335 char_u *name;
2337 2336
2338 // If the option value starts with <SID> or s:, then replace that with 2337 // If the option value starts with <SID> or s:, then replace that with
2367 # endif 2366 # endif
2368 # ifdef FEAT_POSTSCRIPT 2367 # ifdef FEAT_POSTSCRIPT
2369 if (varp == &p_pexpr) // 'printexpr' 2368 if (varp == &p_pexpr) // 'printexpr'
2370 p_opt = &p_pexpr; 2369 p_opt = &p_pexpr;
2371 # endif 2370 # endif
2371 if (varp == &p_ccv) // 'charconvert'
2372 p_opt = &p_ccv;
2372 2373
2373 if (p_opt != NULL) 2374 if (p_opt != NULL)
2374 { 2375 {
2375 name = get_scriptlocal_funcname(*p_opt); 2376 name = get_scriptlocal_funcname(*p_opt);
2376 if (name != NULL) 2377 if (name != NULL)