summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2012-01-10 12:42:09 +0100
committerBram Moolenaar <bram@vim.org>2012-01-10 12:42:09 +0100
commit724284b96ed636ed2ce8bdc3d60607da9d6a9263 (patch)
tree6039f759f655db6d801d32d28cdffab7aa21b7ff
parentcd29756e73f5b7943f0d6041030680ea59498d84 (diff)
downloadvim-724284b96ed636ed2ce8bdc3d60607da9d6a9263.tar.gz
updated for version 7.3.394v7.3.394v7-3-394
Problem: When placing a mark while starting up a screen redraw messes up the screen. (lith) Solution: Don't redraw while still starting up. (Christian Brabandt)
-rw-r--r--src/screen.c10
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 3 deletions
diff --git a/src/screen.c b/src/screen.c
index 2c87e9b9..ad2d345f 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -764,9 +764,13 @@ update_debug_sign(buf, lnum)
doit = TRUE;
}
- /* Return when there is nothing to do or screen updating already
- * happening. */
- if (!doit || updating_screen)
+ /* Return when there is nothing to do, screen updating is already
+ * happening (recursive call) or still starting up. */
+ if (!doit || updating_screen
+#ifdef FEAT_GUI
+ || gui.starting
+#endif
+ || starting)
return;
/* update all windows that need updating */
diff --git a/src/version.c b/src/version.c
index 42ef75c1..b7fa49ce 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 394,
+/**/
393,
/**/
392,