From a53618dd1dd91c7bb67b5dfc83dc29371b47f55b Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 29 Jun 2020 23:14:02 +0200 Subject: [PATCH] patch 8.2.1094: dead code in libvterm Problem: Dead code in libvterm. Solution: Remove condition that is always true. --- src/libvterm/src/pen.c | 3 +-- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libvterm/src/pen.c b/src/libvterm/src/pen.c index 173f64f68..c5a0b71c5 100644 --- a/src/libvterm/src/pen.c +++ b/src/libvterm/src/pen.c @@ -106,8 +106,7 @@ static int lookup_colour(const VTermState *state, int palette, const long args[] } lookup_colour_palette(state, args[0], col); - - return argcount ? 1 : 0; + return 1; default: DEBUG_LOG1("Unrecognised colour palette %d\n", palette); diff --git a/src/version.c b/src/version.c index 369724830..83f5c2efe 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1094, /**/ 1093, /**/ -- 2.50.1