Mercurial > vim
changeset 27275:841145bb9885 v8.2.4166
patch 8.2.4166: undo synced when switching buffer in another window
Commit: https://github.com/vim/vim/commit/e615db06046312e74886fa1ef98feb5a9db2a7c3
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jan 20 21:00:54 2022 +0000
patch 8.2.4166: undo synced when switching buffer in another window
Problem: Undo synced when switching buffer in another window.
Solution: Do not sync undo when not needed. (closes https://github.com/vim/vim/issues/9575)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 20 Jan 2022 22:15:03 +0100 |
| parents | 34e3b99f045d |
| children | 0909c28d1fde |
| files | src/buffer.c src/testdir/test_timers.vim src/version.c |
| diffstat | 3 files changed, 30 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buffer.c +++ b/src/buffer.c @@ -1744,7 +1744,11 @@ set_curbuf(buf_T *buf, int action) { win_T *previouswin = curwin; - if (prevbuf == curbuf) + // Do not sync when in Insert mode and the buffer is open in + // another window, might be a timer doing something in another + // window. + if (prevbuf == curbuf + && ((State & INSERT) == 0 || curbuf->b_nwindows <= 1)) u_sync(FALSE); close_buffer(prevbuf == curwin->w_buffer ? curwin : NULL, prevbuf, unload ? action : (action == DOBUF_GOTO
--- a/src/testdir/test_timers.vim +++ b/src/testdir/test_timers.vim @@ -484,5 +484,28 @@ func Test_timer_outputting_message() call delete('XTest_timermessage') endfunc +func Test_timer_using_win_execute_undo_sync() + let bufnr1 = bufnr() + new + let g:bufnr2 = bufnr() + let g:winid = win_getid() + exe "buffer " .. bufnr1 + wincmd w + call setline(1, ['test']) + autocmd InsertEnter * call timer_start(100, { -> win_execute(g:winid, 'buffer ' .. g:bufnr2) }) + call timer_start(200, { -> feedkeys("\<CR>bbbb\<Esc>") }) + call feedkeys("Oaaaa", 'x!t') + " will hang here until the second timer fires + call assert_equal(['aaaa', 'bbbb', 'test'], getline(1, '$')) + undo + call assert_equal(['test'], getline(1, '$')) + + bwipe! + bwipe! + unlet g:winid + unlet g:bufnr2 + au! InsertEnter +endfunc + " vim: shiftwidth=2 sts=2 expandtab