From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 16 Mar 2012 18:07:58 +0000 (+0100)
Subject: updated for version 7.3.472
X-Git-Tag: v7.3.472
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ad15df9ce49f0b7adeac2c8387319d6f309bd5f;p=vim

updated for version 7.3.472
Problem:    Crash when using ":redraw" in a BufEnter autocommand and
            switching to another tab. (驼峰)
Solution:   Move triggering the the autocommands to after correcting the
            option values. Also check the row value to be out of bounds.
            (Christian Brabandt, Sergey Khorev)
---

diff --git a/src/screen.c b/src/screen.c
index 9bac8bce3..97d636d70 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -5371,6 +5371,12 @@ screen_line(row, coloff, endcol, clear_width
 # define CHAR_CELLS 1
 #endif
 
+    /* Check for illegal row and col, just in case. */
+    if (row >= Rows)
+	row = Rows - 1;
+    if (endcol > Columns)
+	endcol = Columns;
+
 # ifdef FEAT_CLIPBOARD
     clip_may_clear_selection(row, row);
 # endif
diff --git a/src/version.c b/src/version.c
index 41d967aff..f52d9fa4a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    472,
 /**/
     471,
 /**/
diff --git a/src/window.c b/src/window.c
index 6c02570ff..0a0a2d495 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3676,13 +3676,6 @@ enter_tabpage(tp, old_curbuf)
     win_enter_ext(tp->tp_curwin, FALSE, TRUE);
     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
-
     last_status(FALSE);		/* status line may appear or disappear */
     (void)win_comp_pos();	/* recompute w_winrow for all windows */
     must_redraw = CLEAR;	/* need to redraw everything */
@@ -3712,6 +3705,14 @@ enter_tabpage(tp, old_curbuf)
     gui_may_update_scrollbars();
 #endif
 
+#ifdef FEAT_AUTOCMD
+    /* Apply autocommands after updating the display, when 'rows' and
+     * 'columns' have been set correctly. */
+    apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
+    if (old_curbuf != curbuf)
+	apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
+#endif
+
     redraw_all_later(CLEAR);
 }