Merge pull request #17403 from zeertzjq/vim-8.1.1955

vim-patch:8.1.{1846,1955},8.2.0156
This commit is contained in:
zeertzjq
2022-02-21 08:02:45 +08:00
committed by GitHub
18 changed files with 62 additions and 54 deletions

View File

@@ -1441,7 +1441,7 @@ void set_curbuf(buf_T *buf, int action)
set_bufref(&prevbufref, prevbuf);
set_bufref(&newbufref, buf);
// Autocommands may delete the curren buffer and/or the buffer we want to go
// Autocommands may delete the current buffer and/or the buffer we want to go
// to. In those cases don't close the buffer.
if (!apply_autocmds(EVENT_BUFLEAVE, NULL, NULL, false, curbuf)
|| (bufref_valid(&prevbufref) && bufref_valid(&newbufref)
@@ -1454,6 +1454,7 @@ void set_curbuf(buf_T *buf, int action)
}
if (bufref_valid(&prevbufref) && !aborting()) {
win_T *previouswin = curwin;
// Do not sync when in Insert mode and the buffer is open in
// another window, might be a timer doing something in another
// window.