Skip to content

Commit d6f2ee3

Browse files
committed
patch 7.4.2246
Problem: Oldfiles test fails. Solution: Include missing changes.
1 parent 77401ad commit d6f2ee3

2 files changed

Lines changed: 3 additions & 18 deletions

File tree

src/ex_cmds.c

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8456,34 +8456,19 @@ ex_oldfiles(exarg_T *eap UNUSED)
84568456
list_T *l = get_vim_var_list(VV_OLDFILES);
84578457
listitem_T *li;
84588458
int nr = 0;
8459-
char_u *reg_pat = NULL;
84608459
char_u *fname;
8461-
regmatch_T regmatch;
84628460

84638461
if (l == NULL)
84648462
msg((char_u *)_("No old files"));
84658463
else
84668464
{
8467-
if (*eap->arg != NUL)
8468-
{
8469-
if (skip_vimgrep_pat(eap->arg, &reg_pat, NULL) == NULL)
8470-
{
8471-
EMSG(_(e_invalpat));
8472-
return;
8473-
}
8474-
regmatch.regprog = vim_regcomp(reg_pat, p_magic ? RE_MAGIC : 0);
8475-
if (regmatch.regprog == NULL)
8476-
return;
8477-
}
8478-
84798465
msg_start();
84808466
msg_scroll = TRUE;
84818467
for (li = l->lv_first; li != NULL && !got_int; li = li->li_next)
84828468
{
84838469
++nr;
84848470
fname = get_tv_string(&li->li_tv);
8485-
if (reg_pat == NULL || *reg_pat == NUL
8486-
|| vim_regexec(&regmatch, fname, (colnr_T)0))
8471+
if (!message_filtered(fname))
84878472
{
84888473
msg_outnum((long)nr);
84898474
MSG_PUTS(": ");
@@ -8493,8 +8478,6 @@ ex_oldfiles(exarg_T *eap UNUSED)
84938478
ui_breakcheck();
84948479
}
84958480
}
8496-
if (*eap->arg != NUL)
8497-
vim_regfree(regmatch.regprog);
84988481

84998482
/* Assume "got_int" was set to truncate the listing. */
85008483
got_int = FALSE;

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,8 @@ static char *(features[]) =
763763

764764
static int included_patches[] =
765765
{ /* Add new patch number below this line */
766+
/**/
767+
2246,
766768
/**/
767769
2245,
768770
/**/

0 commit comments

Comments
 (0)