summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-07-11 21:01:01 +0000
committerBram Moolenaar <Bram@vim.org>2006-07-11 21:01:01 +0000
commita3f2ecdecb2854f1c0da13dc80435ddf7df2c57c (patch)
treed14bdc5fd5dacfd7439a9f197d1d55ed188abf83
parent6c60ea21c278b15fa8cb6075dcf21a40137e748a (diff)
downloadvim-git-a3f2ecdecb2854f1c0da13dc80435ddf7df2c57c.tar.gz
updated for version 7.0-037v7.0.037
-rw-r--r--src/screen.c7
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/screen.c b/src/screen.c
index 07eaaaadb..71aec85c0 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -7129,6 +7129,12 @@ screenalloc(clear)
return;
entered = TRUE;
+ /*
+ * Note that the window sizes are updated before reallocating the arrays,
+ * thus we must not redraw here!
+ */
+ ++RedrawingDisabled;
+
win_new_shellsize(); /* fit the windows in the new sized shell */
comp_col(); /* recompute columns for shown command and ruler */
@@ -7363,6 +7369,7 @@ screenalloc(clear)
#endif
entered = FALSE;
+ --RedrawingDisabled;
#ifdef FEAT_AUTOCMD
if (starting == 0)
diff --git a/src/version.c b/src/version.c
index 318bc93a1..8c03ce877 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 37,
+/**/
36,
/**/
35,