From 40b4872966d3886e7ff86184ae4ffb58704bf075 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 5 Feb 2023 17:04:50 +0000 Subject: [PATCH] patch 9.0.1284: compiler warnings for uninitialized variables Problem: Compiler warnings for uninitialized variables. (Tony Mechelynck) Solution: Add variable initializations. --- src/option.c | 4 ++-- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/option.c b/src/option.c index f22f9f37e..420d36d05 100644 --- a/src/option.c +++ b/src/option.c @@ -2096,7 +2096,6 @@ do_set_option( char_u key_name[2]; int nextchar; // next non-white char after option name int afterchar; // character just after option name - int cp_val; char *errmsg = NULL; int key; int len; @@ -2167,6 +2166,7 @@ do_set_option( else { flags = P_STRING; + varp = NULL; if (key < 0) { key_name[0] = KEY2TERMCAP0(key); @@ -2183,10 +2183,10 @@ do_set_option( if (validate_opt_idx(opt_idx, opt_flags, flags, &errmsg) == FAIL) goto skip; + int cp_val = p_cp; if (vim_strchr((char_u *)"?=:!&<", nextchar) != NULL) { arg += len; - cp_val = p_cp; if (nextchar == '&' && arg[1] == 'v' && arg[2] == 'i') { if (arg[3] == 'm') // "opt&vim": set to Vim default diff --git a/src/version.c b/src/version.c index fb8795b16..97767d292 100644 --- a/src/version.c +++ b/src/version.c @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1284, /**/ 1283, /**/ -- 2.50.1