summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-11-12 18:32:00 +0100
committerBram Moolenaar <Bram@vim.org>2017-11-12 18:32:00 +0100
commit2f27aab8e68c48a1b8a51715e1009d572f8e13b5 (patch)
tree8f8e50e8d156dd9abe02a3e40bc0dcda61537311
parent60e73f2acc890f07056fa1bea8dbe89d26918b3e (diff)
downloadvim-git-2f27aab8e68c48a1b8a51715e1009d572f8e13b5.tar.gz
patch 8.0.1294: GUI: get stuck when splitting a terminal windowv8.0.1294
Problem: GUI: get stuck when splitting a terminal window. Solution: Stop blinking when values become zero. (Hirohito Higashi)
-rw-r--r--src/gui.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gui.c b/src/gui.c
index 2ce300927..e6cc544dc 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -1118,6 +1118,8 @@ gui_update_cursor(
gui_mch_set_blinking(shape->blinkwait,
shape->blinkon,
shape->blinkoff);
+ if (shape->blinkoff == 0 || shape->blinkon == 0 || shape->blinkoff == 0)
+ gui_mch_stop_blink();
#ifdef FEAT_TERMINAL
if (shape_bg != INVALCOLOR)
{
diff --git a/src/version.c b/src/version.c
index 871a0e9bf..1fd6502c9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1294,
+/**/
1293,
/**/
1292,