diff options
| author | Sean Dewar <seandewar@users.noreply.github.com> | 2021-11-25 22:53:14 +0000 |
|---|---|---|
| committer | Sean Dewar <seandewar@users.noreply.github.com> | 2021-12-07 11:34:28 +0000 |
| commit | 361f548437a0a9b620db620356fdd405d24a7b34 (patch) | |
| tree | 5c1f37e6bf9c6dac63cebb4a87d99183f7799e17 /src/nvim/window.c | |
| parent | 0f792b284fbb924d46020a31162a7660fa6dc077 (diff) | |
| download | rneovim-361f548437a0a9b620db620356fdd405d24a7b34.tar.gz rneovim-361f548437a0a9b620db620356fdd405d24a7b34.tar.bz2 rneovim-361f548437a0a9b620db620356fdd405d24a7b34.zip | |
vim-patch:8.2.3671: restarting Insert mode in prompt buffer too often
Problem: Restarting Insert mode in prompt buffer too often when a callback
switches windows and comes back. (Sean Dewar)
Solution: Do not set "restart_edit" when already in Insert mode.
https://github.com/vim/vim/commit/34c20ff85b87be587ea5d0398812441b502ee6a5
As Test_prompt_switch_windows is skipped, implement it in prompt_buffer_spec.
Replace the 50ms term_wait calls with poke_eventloop (test seems to work anyway
without them, so maybe they're not required?)
The new test does include a duplicate screen test that may generate a "screen
test succeeded immediately" warning, but this is done to match the Vim test.
Diffstat (limited to 'src/nvim/window.c')
| -rw-r--r-- | src/nvim/window.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c index e0ba4b72f3..be963d8374 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -2271,8 +2271,10 @@ void entering_window(win_T *const win) } // When entering the prompt window restart Insert mode if we were in Insert - // mode when we left it. - restart_edit = win->w_buffer->b_prompt_insert; + // mode when we left it and not already in Insert mode. + if ((State & INSERT) == 0) { + restart_edit = win->w_buffer->b_prompt_insert; + } } /// Closes all windows for buffer `buf`. |