diff options
| author | Sean Dewar <seandewar@users.noreply.github.com> | 2023-06-23 22:32:07 +0100 |
|---|---|---|
| committer | Sean Dewar <seandewar@users.noreply.github.com> | 2023-07-05 08:33:32 +0100 |
| commit | aa4e47f704c53ab1d825260d2bf34e2872e3ca89 (patch) | |
| tree | 872bb909c1001e59a16783e973a0e0bb831417e8 /src/nvim/api/buffer.c | |
| parent | 77118d0da8badc4135be430f4cbb15bc95bc760f (diff) | |
| download | rneovim-aa4e47f704c53ab1d825260d2bf34e2872e3ca89.tar.gz rneovim-aa4e47f704c53ab1d825260d2bf34e2872e3ca89.tar.bz2 rneovim-aa4e47f704c53ab1d825260d2bf34e2872e3ca89.zip | |
fix(api): disallow some more functions during textlock
Problem: nvim_buf_set_text(), nvim_open_term() and termopen() all change buffer
text, which is forbidden during textlock. Additionally, nvim_open_term() and
termopen() may be used to convert the cmdwin buffer into a terminal buffer,
which is weird.
Solution: Allow nvim_buf_set_text() and nvim_open_term() in the cmdwin, but
disallow nvim_open_term() from converting the cmdwin buffer into a terminal
buffer. termopen() is not allowed in the cmdwin (as it always operates on
curbuf), so just check text_locked().
Also happens to improve the error in #21055: nvim_buf_set_text() was callable
during textlock, but happened to check textlock indirectly via u_save();
however, this caused the error to be overwritten by an unhelpful "Failed to
save undo information" message when msg_list == NULL (e.g: an `<expr>` mapping
invoked outside of do_cmdline()).
Diffstat (limited to 'src/nvim/api/buffer.c')
| -rw-r--r-- | src/nvim/api/buffer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c index 7cd9686544..02b97b0ae1 100644 --- a/src/nvim/api/buffer.c +++ b/src/nvim/api/buffer.c @@ -515,6 +515,7 @@ end: void nvim_buf_set_text(uint64_t channel_id, Buffer buffer, Integer start_row, Integer start_col, Integer end_row, Integer end_col, ArrayOf(String) replacement, Error *err) FUNC_API_SINCE(7) + FUNC_API_TEXTLOCK_ALLOW_CMDWIN { MAXSIZE_TEMP_ARRAY(scratch, 1); if (replacement.size == 0) { |