mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-20 02:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.2312

Browse Source 
Problem:    Crash when autocommand moves to another tab. (Dominique Pelle)
Solution:   When navigating to another window halfway the :edit command go
            back to the right window.

5a49789a9b
This commit is contained in:
Grzegorz Milka
2016-10-18 02:02:47 +02:00
parent c5c8a82134
commit 9755a2ffd5
6 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/ex_cmds.c
View File

@@ -2253,25 +2253,23 @@ do_ecmd (
if (buf == curbuf) /* already in new buffer */
auto_buf = TRUE;
else {
win_T *the_curwin = curwin;
// Set the w_closing flag to avoid that autocommands close the window.
the_curwin->w_closing = TRUE;
if (curbuf == old_curbuf)
buf_copy_options(buf, BCO_ENTER);
/* close the link to the current buffer */
// Close the link to the current buffer. This will set
// curwin->w_buffer to NULL.
u_sync(FALSE);
close_buffer(oldwin, curbuf,
(flags & ECMD_HIDE) || curbuf->terminal ? 0 : DOBUF_UNLOAD, FALSE);
/* Autocommands may open a new window and leave oldwin open
* which leads to crashes since the above call sets
* oldwin->w_buffer to NULL. */
if (curwin != oldwin && oldwin != aucmd_win && win_valid(oldwin)) {
assert(oldwin);
if (oldwin->w_buffer == NULL) {
win_close(oldwin, FALSE);
}
}
the_curwin->w_closing = FALSE;
if (aborting()) { /* autocmds may abort script processing */
// autocmds may abort script processing
if (aborting() && curwin->w_buffer != NULL) {
xfree(new_name);
goto theend;
}