diff options
author | Bram Moolenaar <Bram@vim.org> | 2018-08-07 19:48:08 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2018-08-07 19:48:08 +0200 |
commit | 8d8a65e389cef318ae661ff0fe7b1b00fd7cb25f (patch) | |
tree | 0f1e413438e3feec77849764b9879df35358287d /src | |
parent | 447bd5a346b5c4bf4d91280700bdb4b45e0aa667 (diff) |
patch 8.1.0248: duplicated quickfix codev8.1.0248
Problem: duplicated quickfix code.
Solution: Move the code to a function.
Diffstat (limited to 'src')
-rw-r--r-- | src/quickfix.c | 40 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 24 insertions, 18 deletions
diff --git a/src/quickfix.c b/src/quickfix.c index 97bfb37cab..6108b36be3 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -4126,6 +4126,20 @@ qf_id2nr(qf_info_T *qi, int_u qfid) } /* + * 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". */ int @@ -4247,12 +4261,8 @@ ex_make(exarg_T *eap) apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name, curbuf->b_fname, TRUE, curbuf); if (res > 0 && !eap->forceit && qflist_valid(wp, save_qfid)) - { - // 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); - qf_jump(qi, 0, 0, FALSE); /* display first error */ - } + // display the first error + qf_jump_first(qi, save_qfid, FALSE); cleanup: mch_remove(fname); @@ -4650,10 +4660,8 @@ ex_cfile(exarg_T *eap) if (res > 0 && (eap->cmdidx == CMD_cfile || eap->cmdidx == CMD_lfile) && qflist_valid(wp, save_qfid)) { - // 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); - qf_jump(qi, 0, 0, eap->forceit); /* display first error */ + // display the first error + qf_jump_first(qi, save_qfid, eap->forceit); } } @@ -6361,10 +6369,8 @@ ex_cbuffer(exarg_T *eap) eap->cmdidx == CMD_lbuffer) && qflist_valid(wp, save_qfid)) { - // 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); - qf_jump(qi, 0, 0, eap->forceit); /* display first error */ + // display the first error + qf_jump_first(qi, save_qfid, eap->forceit); } } } @@ -6443,10 +6449,8 @@ ex_cexpr(exarg_T *eap) || eap->cmdidx == CMD_lexpr) && qflist_valid(wp, save_qfid)) { - // 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); - qf_jump(qi, 0, 0, eap->forceit); + // display the first error + qf_jump_first(qi, save_qfid, eap->forceit); } } else diff --git a/src/version.c b/src/version.c index 95a2e5b432..cc1648ff84 100644 --- a/src/version.c +++ b/src/version.c @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 248, +/**/ 247, /**/ 246, |