0
0
mirror of https://github.com/vim/vim.git synced 2025-07-24 10:45:12 -04:00

updated for version 7.2-220

This commit is contained in:
Bram Moolenaar 2009-07-01 15:13:56 +00:00
parent a0b1997e13
commit 2bc76e617b
2 changed files with 9 additions and 2 deletions

View File

@ -8441,13 +8441,16 @@ aucmd_prepbuf(aco, buf)
win_init_empty(aucmd_win); /* set cursor and topline to safe values */ win_init_empty(aucmd_win); /* set cursor and topline to safe values */
#ifdef FEAT_WINDOWS #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); make_snapshot(SNAP_AUCMD_IDX);
save_ea = p_ea; save_ea = p_ea;
p_ea = FALSE; p_ea = FALSE;
(void)win_split_ins(0, WSP_TOP, aucmd_win, 0); (void)win_split_ins(0, WSP_TOP, aucmd_win, 0);
(void)win_comp_pos(); /* recompute window positions */ (void)win_comp_pos(); /* recompute window positions */
p_ea = save_ea; p_ea = save_ea;
unblock_autocmds();
#endif #endif
curwin = aucmd_win; curwin = aucmd_win;
} }
@ -8474,7 +8477,8 @@ aucmd_restbuf(aco)
--curbuf->b_nwindows; --curbuf->b_nwindows;
#ifdef FEAT_WINDOWS #ifdef FEAT_WINDOWS
/* Find "aucmd_win", it can't be closed, but it may be in another tab /* 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) if (curwin != aucmd_win)
{ {
tabpage_T *tp; tabpage_T *tp;
@ -8498,6 +8502,7 @@ aucmd_restbuf(aco)
last_status(FALSE); /* may need to remove last status line */ last_status(FALSE); /* may need to remove last status line */
restore_snapshot(SNAP_AUCMD_IDX, FALSE); restore_snapshot(SNAP_AUCMD_IDX, FALSE);
(void)win_comp_pos(); /* recompute window positions */ (void)win_comp_pos(); /* recompute window positions */
unblock_autocmds();
if (win_valid(aco->save_curwin)) if (win_valid(aco->save_curwin))
curwin = aco->save_curwin; curwin = aco->save_curwin;

View File

@ -676,6 +676,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 */
/**/
220,
/**/ /**/
219, 219,
/**/ /**/