From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 14 Apr 2020 18:56:31 +0000 (+0200)
Subject: patch 8.2.0579: Coverity warns for unused value
X-Git-Tag: v8.2.0579
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d5d0dfe9438bd5f2daa41ebbe6ac9a76d165af0;p=vim

patch 8.2.0579: Coverity warns for unused value

Problem:    Coverity warns for unused value.
Solution:   Change order and use "else if".
---

diff --git a/src/os_unix.c b/src/os_unix.c
index 397342c68..c6d386b92 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -5491,13 +5491,14 @@ mch_job_start(char **argv, job_T *job, jobopt_T *options, int is_terminal)
 		term = getenv("TERM");
 #endif
 	    // Use 'term' or $TERM if it starts with "xterm", otherwise fall
-	    // back to "xterm".
+	    // back to "xterm" or "xterm-color".
 	    if (term == NULL || *term == NUL || STRNCMP(term, "xterm", 5) != 0)
 	    {
-		if (t_colors > 16)
-		    term = "xterm-color";
 		if (t_colors >= 256)
+		    // TODO: should we check this name is supported?
 		    term = "xterm-256color";
+		else if (t_colors > 16)
+		    term = "xterm-color";
 		else
 		    term = "xterm";
 	    }
diff --git a/src/version.c b/src/version.c
index 2f64d5a66..58827f2f4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    579,
 /**/
     578,
 /**/