diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-04-29 21:24:42 -0400 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2017-04-29 23:48:27 -0400 |
| commit | ab50c1fdb73aa58f620491d50c6fcd222d37cb9d (patch) | |
| tree | b94cde47a7377fd7e114a91728a7bde8b33aeadb | |
| parent | f477c23c6282bffb8908f53592923e81443bac24 (diff) | |
| download | rneovim-ab50c1fdb73aa58f620491d50c6fcd222d37cb9d.tar.gz rneovim-ab50c1fdb73aa58f620491d50c6fcd222d37cb9d.tar.bz2 rneovim-ab50c1fdb73aa58f620491d50c6fcd222d37cb9d.zip | |
vim-patch:7.4.2246
Problem: Oldfiles test fails.
Solution: Include missing changes.
https://github.com/vim/vim/commit/d6f2ee32dcfa18c781ef157918b524318a2215a2
| -rw-r--r-- | src/nvim/ex_cmds.c | 20 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 20 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index 95cbcbbcb9..772527532e 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -6213,27 +6213,12 @@ void ex_oldfiles(exarg_T *eap) if (l == NULL) { msg((char_u *)_("No old files")); } else { - char_u *reg_pat = NULL; - regmatch_T regmatch; - - 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++; const char *fname = tv_get_string(&li->li_tv); - if (reg_pat == NULL || *reg_pat == NUL - || vim_regexec(®match, (char_u *)fname, (colnr_T)0)) { + if (!message_filtered((char_u *)fname)) { msg_outnum(nr); MSG_PUTS(": "); msg_outtrans((char_u *)tv_get_string(&li->li_tv)); @@ -6243,9 +6228,6 @@ void ex_oldfiles(exarg_T *eap) os_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/nvim/version.c b/src/nvim/version.c index c94e2b9f96..f2a97cf360 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -198,7 +198,7 @@ static const int included_patches[] = { 2249, 2248, // 2247 NA - // 2246, + 2246, 2245, 2244, // 2243 NA |