diff src/evalvars.c @ 27338:c62006deb5c1 v8.2.4197

patch 8.2.4197: cannot use an import in the "expr" part of 'spellsuggest' Commit: https://github.com/vim/vim/commit/2a7aa834583dea157eccf3e69827d2ff1d9fe9c7 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jan 23 17:59:06 2022 +0000 patch 8.2.4197: cannot use an import in the "expr" part of 'spellsuggest' Problem: Cannot use an import in the "expr" part of 'spellsuggest'. Solution: Set the script context when evaluating "expr" of 'spellsuggest'.
author Bram Moolenaar <Bram@vim.org>
date Sun, 23 Jan 2022 19:00:02 +0100
parents aeadf4315bef
children 2ca6dd1f62af
line wrap: on
line diff
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -495,12 +495,17 @@ eval_spell_expr(char_u *badword, char_u 
     typval_T	rettv;
     list_T	*list = NULL;
     char_u	*p = skipwhite(expr);
+    sctx_T	saved_sctx = current_sctx;
+    sctx_T	*ctx;
 
     // Set "v:val" to the bad word.
     prepare_vimvar(VV_VAL, &save_val);
     set_vim_var_string(VV_VAL, badword, -1);
     if (p_verbose == 0)
 	++emsg_off;
+    ctx = get_option_sctx("spellsuggest");
+    if (ctx != NULL)
+	current_sctx = *ctx;
 
     if (eval1(&p, &rettv, &EVALARG_EVALUATE) == OK)
     {
@@ -514,6 +519,7 @@ eval_spell_expr(char_u *badword, char_u 
 	--emsg_off;
     clear_tv(get_vim_var_tv(VV_VAL));
     restore_vimvar(VV_VAL, &save_val);
+    current_sctx = saved_sctx;
 
     return list;
 }