patch 7.4.2246

Problem:    Oldfiles test fails.
Solution:   Include missing changes.

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 5c79e959412e38b580b71609f9b3d0b2f65fdd5f..f8c57343e565f7193e13fa600b9b9f317b969de3 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -8456,34 +8456,19 @@ ex_oldfiles(exarg_T *eap UNUSED)
     list_T     *l = get_vim_var_list(VV_OLDFILES);
     listitem_T *li;
     int                nr = 0;
-    char_u     *reg_pat = NULL;
     char_u     *fname;
-    regmatch_T regmatch;
 
     if (l == NULL)
        msg((char_u *)_("No old files"));
     else
     {
-       if (*eap->arg != NUL)
-       {
-           if (skip_vimgrep_pat(eap->arg, &reg_pat, NULL) == NULL)
-           {
-               EMSG(_(e_invalpat));
-               return;
-           }
-           regmatch.regprog = vim_regcomp(reg_pat, p_magic ? RE_MAGIC : 0);
-           if (regmatch.regprog == NULL)
-               return;
-       }
-
        msg_start();
        msg_scroll = TRUE;
        for (li = l->lv_first; li != NULL && !got_int; li = li->li_next)
        {
            ++nr;
            fname = get_tv_string(&li->li_tv);
-           if (reg_pat == NULL || *reg_pat == NUL
-                                 || vim_regexec(&regmatch, fname, (colnr_T)0))
+           if (!message_filtered(fname))
            {
                msg_outnum((long)nr);
                MSG_PUTS(": ");
@@ -8493,8 +8478,6 @@ ex_oldfiles(exarg_T *eap UNUSED)
                ui_breakcheck();
            }
        }
-       if (*eap->arg != NUL)
-           vim_regfree(regmatch.regprog);
 
        /* Assume "got_int" was set to truncate the listing. */
        got_int = FALSE;

diff --git a/src/version.c b/src/version.c
index 2204bc7b5d3c3921dc681879411e47f62c2da177..8186fd6066a61cde5e19f8abf49a5030e2e51549 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2246,
 /**/
     2245,
 /**/