diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2025-02-25 09:17:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-25 01:17:51 +0000 |
| commit | 095c0876c2010d6160df37cf057f2d0ad2c4501f (patch) | |
| tree | a1ad1fbecda4626835bb415a3d4ee80f56c4362a /src/nvim/file_search.c | |
| parent | 614c9322d50052c76fb3e6e1be7536a972ff0902 (diff) | |
| download | rneovim-095c0876c2010d6160df37cf057f2d0ad2c4501f.tar.gz rneovim-095c0876c2010d6160df37cf057f2d0ad2c4501f.tar.bz2 rneovim-095c0876c2010d6160df37cf057f2d0ad2c4501f.zip | |
fix(api): don't override Vimscript SID (#32610)
Problem: When calling an API from Vimscript to set an option, mapping,
etc., :verbose shows that it's set from an API client.
Solution: Don't override current_sctx.sc_sid when calling an API from
Vimscript. Also fix the inverse case where API channel id is
not set when calling an API from RPC. Move channel id into
sctx_T to make saving and restoring easier.
Related #8329
Diffstat (limited to 'src/nvim/file_search.c')
| -rw-r--r-- | src/nvim/file_search.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/file_search.c b/src/nvim/file_search.c index 8ca0676a0f..b0029e7761 100644 --- a/src/nvim/file_search.c +++ b/src/nvim/file_search.c @@ -1747,7 +1747,7 @@ static char *eval_includeexpr(const char *const ptr, const size_t len) { const sctx_T save_sctx = current_sctx; set_vim_var_string(VV_FNAME, ptr, (ptrdiff_t)len); - current_sctx = curbuf->b_p_script_ctx[kBufOptIncludeexpr].script_ctx; + current_sctx = curbuf->b_p_script_ctx[kBufOptIncludeexpr]; char *res = eval_to_string_safe(curbuf->b_p_inex, was_set_insecurely(curwin, kOptIncludeexpr, OPT_LOCAL), |