aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval/funcs.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-11-25 11:06:19 +0800
committerGitHub <noreply@github.com>2022-11-25 11:06:19 +0800
commite2a8ea76ea2f7d5e71441f0fac75df35caf85c03 (patch)
treebd7967ac22e346178e5a6af5448d3631efc3c33f /src/nvim/eval/funcs.c
parent2b55d09314500c0049427cd51e873cc4eac223b2 (diff)
parent0482f53395e7b26016942bd8e5a173a7894a44a5 (diff)
downloadrneovim-e2a8ea76ea2f7d5e71441f0fac75df35caf85c03.tar.gz
rneovim-e2a8ea76ea2f7d5e71441f0fac75df35caf85c03.tar.bz2
rneovim-e2a8ea76ea2f7d5e71441f0fac75df35caf85c03.zip
Merge pull request #21185 from zeertzjq/vim-8.2.2466
vim-patch:8.2.{2466,2886},9.0.0936
Diffstat (limited to 'src/nvim/eval/funcs.c')
-rw-r--r--src/nvim/eval/funcs.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index 8ab1178b17..96c483ea75 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -5245,7 +5245,7 @@ static void max_min(const typval_T *const tv, typval_T *const rettv, const bool
TV_LIST_ITER_CONST(tv->vval.v_list, li, {
const varnumber_T i = tv_get_number_chk(TV_LIST_ITEM_TV(li), &error);
if (error) {
- return;
+ return; // type error; errmsg already given
}
if (domax ? i > n : i < n) {
n = i;
@@ -5258,7 +5258,7 @@ static void max_min(const typval_T *const tv, typval_T *const rettv, const bool
TV_DICT_ITER(tv->vval.v_dict, di, {
const varnumber_T i = tv_get_number_chk(&di->di_tv, &error);
if (error) {
- return;
+ return; // type error; errmsg already given
}
if (domax ? i > n : i < n) {
n = i;
@@ -5268,6 +5268,7 @@ static void max_min(const typval_T *const tv, typval_T *const rettv, const bool
semsg(_(e_listdictarg), domax ? "max()" : "min()");
return;
}
+
rettv->vval.v_number = n;
}