diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-04-30 22:31:18 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-04-30 22:31:18 +0200 |
commit | 6adb9ea0a6ca01414f4b591f379b0f829a8273c0 (patch) | |
tree | 8af9e5e5b2ea5d0a76e0fb1b393835c46674b27f /src/eval.c | |
parent | 4e5534fab798ab7c95554da3bc80b08336aedc2b (diff) | |
download | vim-git-6adb9ea0a6ca01414f4b591f379b0f829a8273c0.tar.gz |
patch 8.2.0670: cannot change window when evaluating 'completefunc'v8.2.0670
Problem: Cannot change window when evaluating 'completefunc'.
Solution: Make a difference between not changing text or buffers and also
not changing window.
Diffstat (limited to 'src/eval.c')
-rw-r--r-- | src/eval.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/eval.c b/src/eval.c index 4bd45e9ce..31dde2fae 100644 --- a/src/eval.c +++ b/src/eval.c @@ -393,7 +393,7 @@ eval_to_string( /* * Call eval_to_string() without using current local variables and using - * textlock. When "use_sandbox" is TRUE use the sandbox. + * textwinlock. When "use_sandbox" is TRUE use the sandbox. */ char_u * eval_to_string_safe( @@ -407,11 +407,11 @@ eval_to_string_safe( save_funccal(&funccal_entry); if (use_sandbox) ++sandbox; - ++textlock; + ++textwinlock; retval = eval_to_string(arg, nextcmd, FALSE); if (use_sandbox) --sandbox; - --textlock; + --textwinlock; restore_funccal(); return retval; } @@ -576,7 +576,7 @@ eval_foldexpr(char_u *arg, int *cp) ++emsg_off; if (use_sandbox) ++sandbox; - ++textlock; + ++textwinlock; *cp = NUL; if (eval0(arg, &tv, NULL, TRUE) == FAIL) retval = 0; @@ -601,7 +601,7 @@ eval_foldexpr(char_u *arg, int *cp) --emsg_off; if (use_sandbox) --sandbox; - --textlock; + --textwinlock; return (int)retval; } |