summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-06-16 15:22:12 +0000
committerBram Moolenaar <Bram@vim.org>2009-06-16 15:22:12 +0000
commitadb09c2e691799163e4b498f689dab854870aca8 (patch)
tree6c2587fe285d18b411e9820cc81bbab3e408de1b
parentbd42a0f5e60014687160cc077d289ae907b4c80c (diff)
downloadvim-git-adb09c2e691799163e4b498f689dab854870aca8.tar.gz
updated for version 7.2-207v7.2.207
-rw-r--r--src/screen.c8
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 0 deletions
diff --git a/src/screen.c b/src/screen.c
index 451c0ee11..abe721ed2 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -5743,6 +5743,13 @@ win_redr_status(wp)
int fillchar;
int attr;
int this_ru_col;
+ static int busy = FALSE;
+
+ /* It's possible to get here recursively when 'statusline' (indirectly)
+ * invokes ":redrawstatus". Simply ignore the call then. */
+ if (busy)
+ return;
+ busy = TRUE;
wp->w_redr_status = FALSE;
if (wp->w_status_height == 0)
@@ -5881,6 +5888,7 @@ win_redr_status(wp)
attr);
}
#endif
+ busy = FALSE;
}
#ifdef FEAT_STL_OPT
diff --git a/src/version.c b/src/version.c
index f9ebbeaa4..2ec6a6a9d 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 */
/**/
+ 207,
+/**/
206,
/**/
205,