]> granicus.if.org Git - vim/commitdiff
patch 8.2.0579: Coverity warns for unused value v8.2.0579
authorBram Moolenaar <Bram@vim.org>
Tue, 14 Apr 2020 18:56:31 +0000 (20:56 +0200)
committerBram Moolenaar <Bram@vim.org>
Tue, 14 Apr 2020 18:56:31 +0000 (20:56 +0200)
Problem:    Coverity warns for unused value.
Solution:   Change order and use "else if".

src/os_unix.c
src/version.c

index 397342c6848289f129fbe796388ac2e3f24b8e7f..c6d386b92923231eb3c51f66191d3b929019c485 100644 (file)
@@ -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";
            }
index 2f64d5a6619787279d10f18cdf3f7f4efad61ad1..58827f2f45a3d8872f38fd271408c265d19f6041 100644 (file)
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    579,
 /**/
     578,
 /**/