To: vim_dev@googlegroups.com Subject: Patch 7.4.2246 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2246 (after 7.4.2244) Problem: Oldfiles test fails. Solution: Include missing changes. Files: src/ex_cmds.c *** ../vim-7.4.2245/src/ex_cmds.c 2016-08-21 22:39:30.995567145 +0200 --- src/ex_cmds.c 2016-08-23 23:03:10.013990452 +0200 *************** *** 8456,8489 **** 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)) { msg_outnum((long)nr); MSG_PUTS(": "); --- 8456,8474 ---- list_T *l = get_vim_var_list(VV_OLDFILES); listitem_T *li; int nr = 0; char_u *fname; if (l == NULL) msg((char_u *)_("No old files")); else { 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 (!message_filtered(fname)) { msg_outnum((long)nr); MSG_PUTS(": "); *************** *** 8493,8500 **** ui_breakcheck(); } } - if (*eap->arg != NUL) - vim_regfree(regmatch.regprog); /* Assume "got_int" was set to truncate the listing. */ got_int = FALSE; --- 8478,8483 ---- *** ../vim-7.4.2245/src/version.c 2016-08-24 00:12:08.868171000 +0200 --- src/version.c 2016-08-24 00:30:06.150472899 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2246, /**/ -- Q: Should I clean my house or work on Vim? A: Whatever contains more bugs. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///