diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 14 | ||||
| -rw-r--r-- | src/nvim/eval/encode.c | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 1 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 9f5a3985d3..d2a7aeb74e 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -5100,6 +5100,7 @@ tv_equal ( } assert(false); + return false; } /* @@ -7614,9 +7615,10 @@ static void assert_bool(typval_T *argvars, bool is_true) if ((argvars[0].v_type != VAR_NUMBER || (get_tv_number_chk(&argvars[0], &error) == 0) == is_true || error) && (argvars[0].v_type != VAR_SPECIAL - || argvars[0].vval.v_special != (is_true - ?kSpecialVarTrue - :kSpecialVarFalse))) { + || (argvars[0].vval.v_special + != (SpecialVarValue) (is_true + ? kSpecialVarTrue + : kSpecialVarFalse)))) { prepare_assert_error(&ga); fill_assert_error(&ga, &argvars[1], (char_u *)(is_true ? "True" : "False"), @@ -8535,7 +8537,7 @@ static void f_diff_hlID(typval_T *argvars, typval_T *rettv) */ static void f_empty(typval_T *argvars, typval_T *rettv) { - bool n; + bool n = true; switch (argvars[0].v_type) { case VAR_STRING: @@ -8562,7 +8564,6 @@ static void f_empty(typval_T *argvars, typval_T *rettv) break; case VAR_UNKNOWN: EMSG2(_(e_intern2), "f_empty(UNKNOWN)"); - n = true; break; } @@ -16215,7 +16216,7 @@ static void f_trunc(typval_T *argvars, typval_T *rettv) */ static void f_type(typval_T *argvars, typval_T *rettv) { - int n; + int n = -1; switch (argvars[0].v_type) { case VAR_NUMBER: n = 0; break; @@ -16240,7 +16241,6 @@ static void f_type(typval_T *argvars, typval_T *rettv) } case VAR_UNKNOWN: { EMSG2(_(e_intern2), "f_type(UNKNOWN)"); - n = -1; break; } } diff --git a/src/nvim/eval/encode.c b/src/nvim/eval/encode.c index b29a4c6f21..8280889fbe 100644 --- a/src/nvim/eval/encode.c +++ b/src/nvim/eval/encode.c @@ -255,7 +255,7 @@ int encode_read_from_list(ListReaderState *const state, char *const buf, while (p < buf_end) { for (size_t i = state->offset; i < state->li_length && p < buf_end; i++) { const char ch = (char) state->li->li_tv.vval.v_string[state->offset++]; - *p++ = (ch == NL ? NUL : ch); + *p++ = (char) ((char) ch == (char) NL ? (char) NUL : (char) ch); } if (p < buf_end) { state->li = state->li->li_next; diff --git a/src/nvim/version.c b/src/nvim/version.c index 8814a592cf..106cc8d1d8 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -78,6 +78,7 @@ static int included_patches[] = { 1511, 1425, 1366, + 1292, 1284, // 1283 1282, |