diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-11-13 21:10:04 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-11-13 21:10:04 +0100 |
| commit | 1dcada1933acdab93ac423951b5958125343833d (patch) | |
| tree | 3ad0b2d1eafda5e928cb2e4149abc200d05b88a3 | |
| parent | e42a6d250907e278707753d7d1ba91ffc2471db0 (diff) | |
| download | vim-git-1dcada1933acdab93ac423951b5958125343833d.tar.gz | |
patch 8.0.1296: checking the same condition twicev8.0.1296
Problem: Checking the same condition twice. (John Marriott)
Solution: Check blinkwait.
| -rw-r--r-- | src/gui.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -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 @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1296, +/**/ 1295, /**/ 1294, |