diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-10-26 19:04:38 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-10-26 20:53:39 +0800 |
| commit | cfccae95844db21aad773c9a8f8b636f53d6c8c4 (patch) | |
| tree | a4929427358343c9b66604209168ef10f2119ae3 /src/nvim/eval/typval.c | |
| parent | d60fa43466eaf59999e39860ce6d0ce2fa2cfb36 (diff) | |
| download | rneovim-cfccae95844db21aad773c9a8f8b636f53d6c8c4.tar.gz rneovim-cfccae95844db21aad773c9a8f8b636f53d6c8c4.tar.bz2 rneovim-cfccae95844db21aad773c9a8f8b636f53d6c8c4.zip | |
vim-patch:8.2.0610: some tests are still old style
Problem: Some tests are still old style.
Solution: Convert to new style tests. (Yegappan Lakshmanan, closes vim/vim#5957)
https://github.com/vim/vim/commit/08f4157c5cabc55bcb22f04dd7c717aba40caa34
Fix missing error message when sort() compare function fails.
Cherry-pick a line in test_utf8.vim from patch 8.2.0448.
Cherry-pick builtin_function() change from patch 8.2.0595.
Diffstat (limited to 'src/nvim/eval/typval.c')
| -rw-r--r-- | src/nvim/eval/typval.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c index 6bb390d793..a6a8c16a3b 100644 --- a/src/nvim/eval/typval.c +++ b/src/nvim/eval/typval.c @@ -1094,7 +1094,9 @@ static int item_compare2(const void *s1, const void *s2, bool keep_zero) tv_clear(&argv[1]); if (res == FAIL) { + // XXX: ITEM_COMPARE_FAIL is unused res = ITEM_COMPARE_FAIL; + sortinfo->item_compare_func_err = true; } else { res = (int)tv_get_number_chk(&rettv, &sortinfo->item_compare_func_err); if (res > 0) { @@ -1257,7 +1259,7 @@ static void do_sort_uniq(typval_T *argvars, typval_T *rettv, bool sort) } else { li = TV_LIST_ITEM_NEXT(l, li); } - if (info.item_compare_func_err) { // -V547 + if (info.item_compare_func_err) { emsg(_("E882: Uniq compare function failed")); break; } |