mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-08 10:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.0610: some tests are still old style

Browse Source 
Problem:    Some tests are still old style.
Solution:   Convert to new style tests. (Yegappan Lakshmanan, closes vim/vim#5957)

08f4157c5c

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.
This commit is contained in:
zeertzjq
2022-10-26 19:04:38 +08:00
parent d60fa43466
commit cfccae9584
12 changed files with 143 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/eval/typval.c
View File

@@ -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;
}