Skip to content

Commit

Permalink
updated for version 7.3.066
Browse files Browse the repository at this point in the history
Problem:    Crash when changing to another window while in a :vimgrep command.
	    (Christian Brabandt)
Solution:   When wiping out the dummy before, remove it from aucmd_win.
  • Loading branch information
brammool committed Nov 24, 2010
1 parent 401556f commit e703226
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
11 changes: 8 additions & 3 deletions src/quickfix.c
Expand Up @@ -3432,6 +3432,7 @@ load_dummy_buffer(fname)
char_u *fname;
{
buf_T *newbuf;
buf_T *newbuf_to_wipe = NULL;
int failed = TRUE;
aco_save_T aco;

Expand Down Expand Up @@ -3468,15 +3469,19 @@ load_dummy_buffer(fname)
failed = FALSE;
if (curbuf != newbuf)
{
/* Bloody autocommands changed the buffer! */
if (buf_valid(newbuf))
wipe_buffer(newbuf, FALSE);
/* Bloody autocommands changed the buffer! Can happen when
* using netrw and editing a remote file. Use the current
* buffer instead, delete the dummy one after restoring the
* window stuff. */
newbuf_to_wipe = newbuf;
newbuf = curbuf;
}
}

/* restore curwin/curbuf and a few other things */
aucmd_restbuf(&aco);
if (newbuf_to_wipe != NULL && buf_valid(newbuf_to_wipe))
wipe_buffer(newbuf_to_wipe, FALSE);
}

if (!buf_valid(newbuf))
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -714,6 +714,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
66,
/**/
65,
/**/
Expand Down

0 comments on commit e703226

Please sign in to comment.