From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 13 Nov 2017 20:10:04 +0000 (+0100)
Subject: patch 8.0.1296: checking the same condition twice
X-Git-Tag: v8.0.1296
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1dcada1933acdab93ac423951b5958125343833d;p=vim

patch 8.0.1296: checking the same condition twice

Problem:    Checking the same condition twice. (John Marriott)
Solution:   Check blinkwait.
---

diff --git a/src/gui.c b/src/gui.c
index e6cc544dc..7ef1c9534 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -1118,7 +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)
+	if (shape->blinkwait == 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 2c190a6b3..6590bf60c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -766,6 +766,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1296,
 /**/
     1295,
 /**/