Mercurial > vim

changeset 12839:9ac41c3148ce v8.0.1296

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1296: checking the same condition twice commit https://github.com/vim/vim/commit/1dcada1933acdab93ac423951b5958125343833d Author: Bram Moolenaar <Bram@vim.org> Date: Mon Nov 13 21:10:04 2017 +0100 patch 8.0.1296: checking the same condition twice Problem: Checking the same condition twice. (John Marriott) Solution: Check blinkwait.
author Christian Brabandt <cb@256bit.org>
date Mon, 13 Nov 2017 21:15:03 +0100
parents e0c190d254b4
children 507ac06ddb3c
files src/gui.c src/version.c
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1296,
+/**/
     1295,
 /**/
     1294,