patch 8.1.0248: duplicated quickfix code

Problem:    duplicated quickfix code.
Solution:   Move the code to a function.

diff --git a/src/quickfix.c b/src/quickfix.c
index 97bfb37cab7d15b986c698dabd189fb69f01ceeb..6108b36be3dbd402ee1eaa09740e68be7f7e8c91 100644 (file)
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -4125,6 +4125,20 @@ qf_id2nr(qf_info_T *qi, int_u qfid)
     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".
  */
@@ -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 95a2e5b432c534916fc89e944d5690415bf6282f..cc1648ff840ec38544adb57ba5a19f12e9367e54 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -794,6 +794,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    248,
 /**/
     247,
 /**/