aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

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.
This commit is contained in:
Bram Moolenaar
2016-09-03 16:29:04 +02:00
parent dd905a2ae1
commit 5a49789a9b
8 changed files with 59 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/ex_cmds.c
View File

@@ -3935,25 +3935,28 @@ do_ecmd(
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.br_buf)
#endif
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) ? 0 : DOBUF_UNLOAD, FALSE);
#ifdef FEAT_AUTOCMD
/* 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) && oldwin->w_buffer == NULL)
win_close(oldwin, FALSE);
the_curwin->w_closing = FALSE;
# ifdef FEAT_EVAL
if (aborting()) /* autocmds may abort script processing */
/* autocmds may abort script processing */
if (aborting() && curwin->w_buffer != NULL)
{
vim_free(new_name);
goto theend;