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

updated for version 7.4.645

Browse Source 
Problem:    When splitting the window in a BufAdd autocommand while still in
            the first, empty buffer the window count is wrong.
Solution:   Do not reset b_nwindows to zero and don't increment it.
This commit is contained in:
Bram Moolenaar
2015-02-27 19:34:56 +01:00
parent ba17ed6797
commit 8da9bbfd02
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/buffer.c
View File

@@ -1794,7 +1794,6 @@ buflist_new(ffname, sfname, lnum, flags)
if (aborting()) /* autocmds may abort script processing */ if (aborting()) /* autocmds may abort script processing */
return NULL; return NULL;
#endif #endif
/* buf->b_nwindows = 0; why was this here? */
free_buffer_stuff(buf, FALSE); /* delete local variables et al. */ free_buffer_stuff(buf, FALSE); /* delete local variables et al. */
/* Init the options. */ /* Init the options. */
@@ -1872,6 +1871,9 @@ buflist_new(ffname, sfname, lnum, flags)
#ifdef FEAT_AUTOCMD #ifdef FEAT_AUTOCMD
if (!(flags & BLN_DUMMY)) if (!(flags & BLN_DUMMY))
{ {
/* Tricky: these autocommands may change the buffer list. They could
* also split the window with re-using the one empty buffer. This may
* result in unexpectedly losing the empty buffer. */
apply_autocmds(EVENT_BUFNEW, NULL, NULL, FALSE, buf); apply_autocmds(EVENT_BUFNEW, NULL, NULL, FALSE, buf);
if (!buf_valid(buf)) if (!buf_valid(buf))
return NULL; return NULL;

5
src/ex_cmds.c
View File

@@ -3375,7 +3375,6 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags, oldwin)
if (buf->b_ml.ml_mfp == NULL) /* no memfile yet */ if (buf->b_ml.ml_mfp == NULL) /* no memfile yet */
{ {
oldbuf = FALSE; oldbuf = FALSE;
buf->b_nwindows = 0;
} }
else /* existing memfile */ else /* existing memfile */
{ {
@@ -3408,7 +3407,7 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags, oldwin)
* Make the (new) buffer the one used by the current window. * Make the (new) buffer the one used by the current window.
* If the old buffer becomes unused, free it if ECMD_HIDE is FALSE. * If the old buffer becomes unused, free it if ECMD_HIDE is FALSE.
* If the current buffer was empty and has no file name, curbuf * If the current buffer was empty and has no file name, curbuf
* is returned by buflist_new(). * is returned by buflist_new(), nothing to do here.
*/ */
if (buf != curbuf) if (buf != curbuf)
{ {
@@ -3515,8 +3514,6 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags, oldwin)
au_new_curbuf = NULL; au_new_curbuf = NULL;
#endif #endif
} }
else
++curbuf->b_nwindows;
curwin->w_pcmark.lnum = 1; curwin->w_pcmark.lnum = 1;
curwin->w_pcmark.col = 0; curwin->w_pcmark.col = 0;

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
645,
/**/ /**/
644, 644,
/**/ /**/