diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-07-01 15:13:56 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-07-01 15:13:56 +0000 |
| commit | 2bc76e617b85366156c3aed82db20dcac52c64fc (patch) | |
| tree | f300e16bc468fb3619e9a53dbfbf74615afaf03b | |
| parent | a0b1997e13d48cf4ec58cff7d06378b07925ec41 (diff) | |
| download | vim-git-2bc76e617b85366156c3aed82db20dcac52c64fc.tar.gz | |
updated for version 7.2-220v7.2.220
| -rw-r--r-- | src/fileio.c | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/fileio.c b/src/fileio.c index 61c21480a..b17806bde 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -8441,13 +8441,16 @@ aucmd_prepbuf(aco, buf) win_init_empty(aucmd_win); /* set cursor and topline to safe values */ #ifdef FEAT_WINDOWS - /* Split the current window, put the aucmd_win in the upper half. */ + /* Split the current window, put the aucmd_win in the upper half. + * We don't want the BufEnter or WinEnter autocommands. */ + block_autocmds(); make_snapshot(SNAP_AUCMD_IDX); save_ea = p_ea; p_ea = FALSE; (void)win_split_ins(0, WSP_TOP, aucmd_win, 0); (void)win_comp_pos(); /* recompute window positions */ p_ea = save_ea; + unblock_autocmds(); #endif curwin = aucmd_win; } @@ -8474,7 +8477,8 @@ aucmd_restbuf(aco) --curbuf->b_nwindows; #ifdef FEAT_WINDOWS /* Find "aucmd_win", it can't be closed, but it may be in another tab - * page. */ + * page. Do not trigger autocommands here. */ + block_autocmds(); if (curwin != aucmd_win) { tabpage_T *tp; @@ -8498,6 +8502,7 @@ aucmd_restbuf(aco) last_status(FALSE); /* may need to remove last status line */ restore_snapshot(SNAP_AUCMD_IDX, FALSE); (void)win_comp_pos(); /* recompute window positions */ + unblock_autocmds(); if (win_valid(aco->save_curwin)) curwin = aco->save_curwin; diff --git a/src/version.c b/src/version.c index 1eb82ffde..b553e4ed4 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 220, +/**/ 219, /**/ 218, |