From d6f2ee32dcfa18c781ef157918b524318a2215a2 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 24 Aug 2016 00:30:52 +0200 Subject: patch 7.4.2246 Problem: Oldfiles test fails. Solution: Include missing changes. --- src/ex_cmds.c | 19 +------------------ src/version.c | 2 ++ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 5c79e95941..f8c57343e5 100644 --- 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, ®_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(®match, 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 2204bc7b5d..8186fd6066 100644 --- 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, /**/ -- cgit v1.2.3