aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/eval.c7
-rw-r--r--src/nvim/version.c1
2 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 85361b50f4..7408a7926a 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -3438,10 +3438,11 @@ static int eval4(char_u **arg, typval_T *rettv, int evaluate)
n1 = !n1;
} else if (rettv->v_type != var2.v_type
|| (type != TYPE_EQUAL && type != TYPE_NEQUAL)) {
- if (rettv->v_type != var2.v_type)
+ if (rettv->v_type != var2.v_type) {
EMSG(_("E691: Can only compare List with List"));
- else
- EMSG(_("E692: Invalid operation for Lists"));
+ } else {
+ EMSG(_("E692: Invalid operation for List"));
+ }
clear_tv(rettv);
clear_tv(&var2);
return FAIL;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 850ec79e82..ffe79a1528 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -202,6 +202,7 @@ static char *(features[]) = {
static int included_patches[] = {
// Add new patch number below this line
+ 286,
285,
284,
//283,