patch 8.0.1296: checking the same condition twice

Problem: Checking the same condition twice. (John Marriott) Solution: Check blinkwait.
vim · Nov 13, 2017 · 1dcada1 · 1dcada1
1 parent e42a6d2
commit 1dcada1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -766,6 +766,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1296,
 /**/
     1295,
 /**/