summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-08-01 20:53:30 +0200
committerBram Moolenaar <Bram@vim.org>2017-08-01 20:53:30 +0200
commit0792048842493f224bbd7a5dfb348d834f61b205 (patch)
tree504ee263d0df8f0ebccf6322d2939ce47839fd0d
parentf55e4c867f774d1f27973d06b07b97c0a4d6b968 (diff)
patch 8.0.0837: signs can be drawn on top of console messagesv8.0.0837
Problem: Signs can be drawn on top of console messages. Solution: don't redraw at a prompt or when scrolled up. (Christian Brabandt, closes #1907)
-rw-r--r--src/screen.c5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c
index ea07d02d42..77d0e4f9b9 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1019,8 +1019,11 @@ update_debug_sign(buf_T *buf, linenr_T lnum)
}
/* Return when there is nothing to do, screen updating is already
- * happening (recursive call) or still starting up. */
+ * happening (recursive call), messages on the screen or still starting up.
+ */
if (!doit || updating_screen
+ || State == ASKMORE || State == HITRETURN
+ || msg_scrolled
#ifdef FEAT_GUI
|| gui.starting
#endif
diff --git a/src/version.c b/src/version.c
index 3aab4d39b8..d6f08bb966 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 837,
+/**/
836,
/**/
835,