summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-07-29 14:24:36 +0000
committerBram Moolenaar <Bram@vim.org>2009-07-29 14:24:36 +0000
commit5e9b4540fdad2e8cb2192da2e964bceeac8aa3fa (patch)
tree5fd769e8e2de20330a403a9598949cbe317c8951
parent801f8b865c7e093ce2a2f96221bfbfd4779da187 (diff)
updated for version 7.2-243v7.2.243
-rw-r--r--src/screen.c7
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c
index abe721ed26..28fe238d26 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -7467,6 +7467,10 @@ retry:
*/
FOR_ALL_TAB_WINDOWS(tp, wp)
win_free_lsize(wp);
+#ifdef FEAT_AUTOCMD
+ if (aucmd_win != NULL)
+ win_free_lsize(aucmd_win);
+#endif
new_ScreenLines = (schar_T *)lalloc((long_u)(
(Rows + 1) * Columns * sizeof(schar_T)), FALSE);
@@ -7504,7 +7508,8 @@ retry:
}
}
#ifdef FEAT_AUTOCMD
- if (aucmd_win != NULL && win_alloc_lines(aucmd_win) == FAIL)
+ if (aucmd_win != NULL && aucmd_win->w_lines == NULL
+ && win_alloc_lines(aucmd_win) == FAIL)
outofmem = TRUE;
#endif
#ifdef FEAT_WINDOWS
diff --git a/src/version.c b/src/version.c
index c762648b31..e16f364c06 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 */
/**/
+ 243,
+/**/
242,
/**/
241,