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

Merge #5500

Browse Source 
Closes #5246
This commit is contained in:
Justin M. Keyes
2016-10-26 14:01:49 +02:00
parent e350902b7d 26b90e95e7
commit 90bf31c742
9 changed files with 202 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/nvim/ex_cmds.c
View File

@@ -2250,28 +2250,28 @@ do_ecmd (
xfree(new_name);
goto theend;
}
if (buf == curbuf) /* already in new buffer */
auto_buf = TRUE;
else {
if (curbuf == old_curbuf)
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 */
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);
}
}
if (aborting()) { /* autocmds may abort script processing */
// 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);
the_curwin->w_closing = false;
// autocmds may abort script processing
if (aborting() && curwin->w_buffer != NULL) {
xfree(new_name);
goto theend;
}