From 59784b91dbf97388281c1eb6989e2e770eb7ecac Mon Sep 17 00:00:00 2001 From: Felipe Morales Date: Thu, 2 Jul 2015 21:21:53 -0300 Subject: vim-patch:7.4.688 #2941 ``` updated for version 7.4.668 Problem: Can't use a glob pattern as a regexp pattern. Solution: Add glob2regpat(). (Christian Brabandt) ``` https://code.google.com/p/vim/source/detail?r=v7-4-668 --- src/nvim/eval.c | 12 ++++++++++++ src/nvim/version.c | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/nvim/eval.c b/src/nvim/eval.c index d3ab47a505..7da5cfb731 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -6512,6 +6512,7 @@ static struct fst { {"getwinposy", 0, 0, f_getwinposy}, {"getwinvar", 2, 3, f_getwinvar}, {"glob", 1, 3, f_glob}, + {"glob2regpat", 1, 1, f_glob2regpat}, {"globpath", 2, 4, f_globpath}, {"has", 1, 1, f_has}, {"has_key", 2, 2, f_has_key}, @@ -9893,6 +9894,17 @@ static void f_globpath(typval_T *argvars, typval_T *rettv) } } +/* + * "glob2regpat()" function + */ +static void f_glob2regpat(typval_T *argvars, typval_T *rettv) +{ + char_u *pat = get_tv_string_chk(&argvars[0]); + + rettv->v_type = VAR_STRING; + rettv->vval.v_string = file_pat_to_reg_pat(pat, NULL, NULL, FALSE); +} + /* * "has()" function */ diff --git a/src/nvim/version.c b/src/nvim/version.c index 930048af6e..c7523bbdc7 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -181,7 +181,7 @@ static int included_patches[] = { //671, //670, //669 NA - //668, + 668, //667, //666 NA //665, -- cgit