aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

updated for version 7.4.668

Browse Source 
Problem:    Can't use a glob pattern as a regexp pattern.
Solution:   Add glob2regpat(). (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2015-03-20 17:36:42 +01:00
parent fbc25b20cb
commit 825e7ab423
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/eval.c
View File

@@ -575,6 +575,7 @@ static void f_getwinposy __ARGS((typval_T *argvars, typval_T *rettv));
static void f_getwinvar __ARGS((typval_T *argvars, typval_T *rettv)); static void f_getwinvar __ARGS((typval_T *argvars, typval_T *rettv));
static void f_glob __ARGS((typval_T *argvars, typval_T *rettv)); static void f_glob __ARGS((typval_T *argvars, typval_T *rettv));
static void f_globpath __ARGS((typval_T *argvars, typval_T *rettv)); static void f_globpath __ARGS((typval_T *argvars, typval_T *rettv));
static void f_glob2regpat __ARGS((typval_T *argvars, typval_T *rettv));
static void f_has __ARGS((typval_T *argvars, typval_T *rettv)); static void f_has __ARGS((typval_T *argvars, typval_T *rettv));
static void f_has_key __ARGS((typval_T *argvars, typval_T *rettv)); static void f_has_key __ARGS((typval_T *argvars, typval_T *rettv));
static void f_haslocaldir __ARGS((typval_T *argvars, typval_T *rettv)); static void f_haslocaldir __ARGS((typval_T *argvars, typval_T *rettv));
@@ -8142,6 +8143,7 @@ static struct fst
{"getwinposy", 0, 0, f_getwinposy}, {"getwinposy", 0, 0, f_getwinposy},
{"getwinvar", 2, 3, f_getwinvar}, {"getwinvar", 2, 3, f_getwinvar},
{"glob", 1, 4, f_glob}, {"glob", 1, 4, f_glob},
{"glob2regpat", 1, 1, f_glob2regpat},
{"globpath", 2, 5, f_globpath}, {"globpath", 2, 5, f_globpath},
{"has", 1, 1, f_has}, {"has", 1, 1, f_has},
{"has_key", 2, 2, f_has_key}, {"has_key", 2, 2, f_has_key},
@@ -12499,6 +12501,20 @@ f_globpath(argvars, rettv)
rettv->vval.v_string = NULL; rettv->vval.v_string = NULL;
} }
/*
* "glob2regpat()" function
*/
static void
f_glob2regpat(argvars, rettv)
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 * "has()" function
*/ */

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
668,
/**/ /**/
667, 667,
/**/ /**/