diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 12 | ||||
| -rw-r--r-- | src/nvim/version.c | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 219bd38d82..33c584eede 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -10786,15 +10786,15 @@ static void f_globpath(typval_T *argvars, typval_T *rettv) } } -/* - * "glob2regpat()" function - */ +// "glob2regpat()" function static void f_glob2regpat(typval_T *argvars, typval_T *rettv) { - char_u *pat = get_tv_string_chk(&argvars[0]); + char_u *pat = get_tv_string_chk(&argvars[0]); // NULL on type error - rettv->v_type = VAR_STRING; - rettv->vval.v_string = file_pat_to_reg_pat(pat, NULL, NULL, FALSE); + rettv->v_type = VAR_STRING; + rettv->vval.v_string = (pat == NULL) + ? NULL + : file_pat_to_reg_pat(pat, NULL, NULL, false); } /* diff --git a/src/nvim/version.c b/src/nvim/version.c index dcd1773a7a..acdee8c005 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -69,6 +69,12 @@ static char *features[] = { // clang-format off static int included_patches[] = { + 1081, + + + + + 1055, // 1054, // 1053, |