vim-patch:7.4.2246

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

d6f2ee32dc
This commit is contained in:
James McCoy
2017-04-29 21:24:42 -04:00
parent f477c23c62
commit ab50c1fdb7
2 changed files with 2 additions and 20 deletions

View File

@@ -6213,27 +6213,12 @@ void ex_oldfiles(exarg_T *eap)
if (l == NULL) { if (l == NULL) {
msg((char_u *)_("No old files")); msg((char_u *)_("No old files"));
} else { } else {
char_u *reg_pat = NULL;
regmatch_T regmatch;
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_start();
msg_scroll = TRUE; msg_scroll = TRUE;
for (li = l->lv_first; li != NULL && !got_int; li = li->li_next) { for (li = l->lv_first; li != NULL && !got_int; li = li->li_next) {
nr++; nr++;
const char *fname = tv_get_string(&li->li_tv); const char *fname = tv_get_string(&li->li_tv);
if (reg_pat == NULL || *reg_pat == NUL if (!message_filtered((char_u *)fname)) {
|| vim_regexec(&regmatch, (char_u *)fname, (colnr_T)0)) {
msg_outnum(nr); msg_outnum(nr);
MSG_PUTS(": "); MSG_PUTS(": ");
msg_outtrans((char_u *)tv_get_string(&li->li_tv)); msg_outtrans((char_u *)tv_get_string(&li->li_tv));
@@ -6243,9 +6228,6 @@ void ex_oldfiles(exarg_T *eap)
os_breakcheck(); os_breakcheck();
} }
} }
if (*eap->arg != NUL) {
vim_regfree(regmatch.regprog);
}
/* Assume "got_int" was set to truncate the listing. */ /* Assume "got_int" was set to truncate the listing. */
got_int = FALSE; got_int = FALSE;

View File

@@ -198,7 +198,7 @@ static const int included_patches[] = {
2249, 2249,
2248, 2248,
// 2247 NA // 2247 NA
// 2246, 2246,
2245, 2245,
2244, 2244,
// 2243 NA // 2243 NA