aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval/userfunc.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-10-27 08:56:48 +0800
committerGitHub <noreply@github.com>2022-10-27 08:56:48 +0800
commitbce6891a69c6de3657173b880d3a800dc94cc651 (patch)
tree7622a4d9d73b918660bd9c8e762fd09790fae28e /src/nvim/eval/userfunc.c
parent23204c83ed5333811192513ed9f61d70682fbee5 (diff)
parent905bef7bd9cd5d1751fc09aad3c6fb78e2c60ff8 (diff)
downloadrneovim-bce6891a69c6de3657173b880d3a800dc94cc651.tar.gz
rneovim-bce6891a69c6de3657173b880d3a800dc94cc651.tar.bz2
rneovim-bce6891a69c6de3657173b880d3a800dc94cc651.zip
Merge pull request #20823 from zeertzjq/vim-8.2.2100
vim-patch:8.2.{2100,2726,2727}
Diffstat (limited to 'src/nvim/eval/userfunc.c')
-rw-r--r--src/nvim/eval/userfunc.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c
index 7440044e52..2a7ad792df 100644
--- a/src/nvim/eval/userfunc.c
+++ b/src/nvim/eval/userfunc.c
@@ -48,6 +48,8 @@ static char *e_funcexts = N_("E122: Function %s already exists, add ! to replace
static char *e_funcdict = N_("E717: Dictionary entry already exists");
static char *e_funcref = N_("E718: Funcref required");
static char *e_nofunc = N_("E130: Unknown function: %s");
+static char e_no_white_space_allowed_before_str_str[]
+ = N_("E1068: No white space allowed before '%s': %s");
void func_init(void)
{
@@ -149,6 +151,15 @@ static int get_function_args(char **argp, char_u endchar, garray_T *newargs, int
emsg(_("E989: Non-default argument follows default argument"));
mustend = true;
}
+
+ if (ascii_iswhite(*p) && *skipwhite(p) == ',') {
+ // Be tolerant when skipping
+ if (!skip) {
+ semsg(_(e_no_white_space_allowed_before_str_str), ",", p);
+ goto err_ret;
+ }
+ p = skipwhite(p);
+ }
if (*p == ',') {
p++;
} else {