0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

updated for version 7.0g05

This commit is contained in:
Bram Moolenaar
2006-05-06 21:38:18 +00:00
parent 7978344972
commit 773560bc60
2 changed files with 12 additions and 6 deletions

View File

@@ -2595,8 +2595,11 @@ do_more_prompt(typed_char)
{ {
/* redisplay all lines */ /* redisplay all lines */
screenclear(); screenclear();
for (i = 0; i < Rows - 1; ++i) for (i = 0; mp != NULL && i < Rows - 1; ++i)
{
mp = disp_sb_line(i, mp); mp = disp_sb_line(i, mp);
++msg_scrolled;
}
} }
scroll = 0; scroll = 0;
} }

View File

@@ -3425,19 +3425,22 @@ enter_tabpage(tp, old_curbuf)
buf_T *old_curbuf; buf_T *old_curbuf;
{ {
int old_off = tp->tp_firstwin->w_winrow; int old_off = tp->tp_firstwin->w_winrow;
win_T *next_prevwin = tp->tp_prevwin;
curtab = tp; curtab = tp;
firstwin = tp->tp_firstwin; firstwin = tp->tp_firstwin;
lastwin = tp->tp_lastwin; lastwin = tp->tp_lastwin;
topframe = tp->tp_topframe; topframe = tp->tp_topframe;
/* We would like doing the TabEnter event first, but we don't have a
* valid current window yet, which may break some commands.
* This triggers autocommands, thus may make "tp" invalid. */
win_enter_ext(tp->tp_curwin, FALSE, TRUE);
prevwin = next_prevwin;
#ifdef FEAT_AUTOCMD #ifdef FEAT_AUTOCMD
apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf); apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
#endif
win_enter_ext(tp->tp_curwin, FALSE, TRUE);
prevwin = tp->tp_prevwin;
#ifdef FEAT_AUTOCMD
if (old_curbuf != curbuf) if (old_curbuf != curbuf)
apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf); apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
#endif #endif