From 773560bc6052d6ee44f5ca0bef1a476ea434f432 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 6 May 2006 21:38:18 +0000
Subject: [PATCH] updated for version 7.0g05
---
src/message.c | 5 ++++-
src/window.c | 11 +++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/message.c b/src/message.c
index a242a26b0c..aebf01bb81 100644
--- a/src/message.c
+++ b/src/message.c
@@ -2595,8 +2595,11 @@ do_more_prompt(typed_char)
{
/* redisplay all lines */
screenclear();
- for (i = 0; i < Rows - 1; ++i)
+ for (i = 0; mp != NULL && i < Rows - 1; ++i)
+ {
mp = disp_sb_line(i, mp);
+ ++msg_scrolled;
+ }
}
scroll = 0;
}
diff --git a/src/window.c b/src/window.c
index cbcdd4eb91..c4cd31a71f 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3425,19 +3425,22 @@ enter_tabpage(tp, old_curbuf)
buf_T *old_curbuf;
{
int old_off = tp->tp_firstwin->w_winrow;
+ win_T *next_prevwin = tp->tp_prevwin;
curtab = tp;
firstwin = tp->tp_firstwin;
lastwin = tp->tp_lastwin;
topframe = tp->tp_topframe;
-#ifdef FEAT_AUTOCMD
- apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
-#endif
+ /* 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 = tp->tp_prevwin;
+ prevwin = next_prevwin;
#ifdef FEAT_AUTOCMD
+ apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
+
if (old_curbuf != curbuf)
apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
#endif
--
GitLab