summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-01-31 22:07:42 +0100
committerBram Moolenaar <Bram@vim.org>2017-01-31 22:07:42 +0100
commite3caa1109072b9655f8d5103c92efd73177f8577 (patch)
tree20aa481c16e2b5df851d2be94ac46e11918855d9
parent070b33da93ad3a191664bb61f5ccc50781460c03 (diff)
patch 8.0.0275: the screen may be updated at the wrong timev8.0.0275
Problem: When checking for CTRL-C typed the GUI may detect a screen resize and redraw the screen, causing trouble. Solution: Set updating_screen in ui_breakcheck().
-rw-r--r--src/ui.c7
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ui.c b/src/ui.c
index ad2919052e..4da79f0c1d 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -363,12 +363,19 @@ ui_breakcheck(void)
void
ui_breakcheck_force(int force)
{
+ int save_us = updating_screen;
+
+ /* We do not want gui_resize_shell() to redraw the screen here. */
+ ++updating_screen;
+
#ifdef FEAT_GUI
if (gui.in_use)
gui_mch_update();
else
#endif
mch_breakcheck(force);
+
+ updating_screen = save_us;
}
/*****************************************************************************
diff --git a/src/version.c b/src/version.c
index 5814b206f4..d8b82a87a9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 275,
+/**/
274,
/**/
273,