updated for version 7.4.668

Problem:    Can't use a glob pattern as a regexp pattern.
Solution:   Add glob2regpat(). (Christian Brabandt)

diff --git a/src/eval.c b/src/eval.c
index cb584f8b8ecbbf472cbfa4e4efe0483c68922af8..7aefdb58fd579c58417fdc2a055de99024bdfef3 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -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_glob __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_key __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},
     {"getwinvar",      2, 3, f_getwinvar},
     {"glob",           1, 4, f_glob},
+    {"glob2regpat",    1, 1, f_glob2regpat},
     {"globpath",       2, 5, f_globpath},
     {"has",            1, 1, f_has},
     {"has_key",                2, 2, f_has_key},
@@ -12499,6 +12501,20 @@ f_globpath(argvars, rettv)
        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
  */

diff --git a/src/version.c b/src/version.c
index c721e0784c0167f769483f7312f476cd483664fb..c5e8a152a8e3062a4e440cce73a81665d0665492 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    668,
 /**/
     667,
 /**/