diff options
| author | Jurica Bradaric <jbradaric@gmail.com> | 2016-05-14 22:41:18 +0200 |
|---|---|---|
| committer | Jurica Bradaric <jbradaric@gmail.com> | 2016-06-09 20:34:43 +0200 |
| commit | b2d15fbebc1470057da3c814f0e1539b021da63e (patch) | |
| tree | 727c101325318adf2eb1887dce494d1b1d5ea4fd /src/nvim/eval.c | |
| parent | 82da7eed343151e11bb281ea37136812a0a93712 (diff) | |
| download | rneovim-b2d15fbebc1470057da3c814f0e1539b021da63e.tar.gz rneovim-b2d15fbebc1470057da3c814f0e1539b021da63e.tar.bz2 rneovim-b2d15fbebc1470057da3c814f0e1539b021da63e.zip | |
vim-patch:7.4.1464
Problem: When the argument of sort() is zero or empty it fails.
Solution: Make zero work as documented. (suggested by Yasuhiro Matsumoto)
https://github.com/vim/vim/commit/5131c144feb046c5e2b72e6c172159d80ce06b3c
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 4d96e79f71..9c2a704367 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -15305,11 +15305,17 @@ static void do_sort_uniq(typval_T *argvars, typval_T *rettv, bool sort) } if (i == 1) { info.item_compare_ic = true; - } else { + } else if (argvars[1].v_type != VAR_NUMBER) { info.item_compare_func = get_tv_string(&argvars[1]); + } else if (i != 0) { + EMSG(_(e_invarg)); + goto theend; } if (info.item_compare_func != NULL) { - if (STRCMP(info.item_compare_func, "n") == 0) { + if (*info.item_compare_func == NUL) { + // empty string means default sort + info.item_compare_func = NULL; + } else if (STRCMP(info.item_compare_func, "n") == 0) { info.item_compare_func = NULL; info.item_compare_numeric = true; } else if (STRCMP(info.item_compare_func, "N") == 0) { |