aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 8.1.0248: duplicated quickfix code

Browse Source 
Problem:    duplicated quickfix code.
Solution:   Move the code to a function.
This commit is contained in:
Bram Moolenaar
2018-08-07 19:48:08 +02:00
parent 447bd5a346
commit 8d8a65e389
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/quickfix.c
View File

@@ -4125,6 +4125,20 @@ qf_id2nr(qf_info_T *qi, int_u qfid)
return INVALID_QFIDX; return INVALID_QFIDX;
} }
/*
* Jump to the first entry if there is one.
*/
static void
qf_jump_first(qf_info_T *qi, int_u save_qfid, int forceit)
{
// If autocommands changed the current list, then restore it
if (qi->qf_lists[qi->qf_curlist].qf_id != save_qfid)
qi->qf_curlist = qf_id2nr(qi, save_qfid);
if (qi->qf_lists[qi->qf_curlist].qf_count > 0)
qf_jump(qi, 0, 0, forceit);
}
/* /*
* Return TRUE when using ":vimgrep" for ":grep". * Return TRUE when using ":vimgrep" for ":grep".
*/ */
@@ -4247,12 +4261,8 @@ ex_make(exarg_T *eap)
apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name, apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name,
curbuf->b_fname, TRUE, curbuf); curbuf->b_fname, TRUE, curbuf);
if (res > 0 && !eap->forceit && qflist_valid(wp, save_qfid)) if (res > 0 && !eap->forceit && qflist_valid(wp, save_qfid))
{ // display the first error
// If autocommands changed the current list, then restore it qf_jump_first(qi, save_qfid, FALSE);
if (qi->qf_lists[qi->qf_curlist].qf_id != save_qfid)
qi->qf_curlist = qf_id2nr(qi, save_qfid);
qf_jump(qi, 0, 0, FALSE); /* display first error */
}
cleanup: cleanup:
mch_remove(fname); mch_remove(fname);
@@ -4650,10 +4660,8 @@ ex_cfile(exarg_T *eap)
if (res > 0 && (eap->cmdidx == CMD_cfile || eap->cmdidx == CMD_lfile) if (res > 0 && (eap->cmdidx == CMD_cfile || eap->cmdidx == CMD_lfile)
&& qflist_valid(wp, save_qfid)) && qflist_valid(wp, save_qfid))
{ {
// If autocommands changed the current list, then restore it // display the first error
if (qi->qf_lists[qi->qf_curlist].qf_id != save_qfid) qf_jump_first(qi, save_qfid, eap->forceit);
qi->qf_curlist = qf_id2nr(qi, save_qfid);
qf_jump(qi, 0, 0, eap->forceit); /* display first error */
} }
} }
@@ -6361,10 +6369,8 @@ ex_cbuffer(exarg_T *eap)
eap->cmdidx == CMD_lbuffer) eap->cmdidx == CMD_lbuffer)
&& qflist_valid(wp, save_qfid)) && qflist_valid(wp, save_qfid))
{ {
// If autocommands changed the current list, then restore it // display the first error
if (qi->qf_lists[qi->qf_curlist].qf_id != save_qfid) qf_jump_first(qi, save_qfid, eap->forceit);
qi->qf_curlist = qf_id2nr(qi, save_qfid);
qf_jump(qi, 0, 0, eap->forceit); /* display first error */
} }
} }
} }
@@ -6443,10 +6449,8 @@ ex_cexpr(exarg_T *eap)
|| eap->cmdidx == CMD_lexpr) || eap->cmdidx == CMD_lexpr)
&& qflist_valid(wp, save_qfid)) && qflist_valid(wp, save_qfid))
{ {
// If autocommands changed the current list, then restore it // display the first error
if (qi->qf_lists[qi->qf_curlist].qf_id != save_qfid) qf_jump_first(qi, save_qfid, eap->forceit);
qi->qf_curlist = qf_id2nr(qi, save_qfid);
qf_jump(qi, 0, 0, eap->forceit);
} }
} }
else else

2
src/version.c
View File

@@ -794,6 +794,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
248,
/**/ /**/
247, 247,
/**/ /**/