patch 8.0.1772: quickfix: mixup of FALSE and FAIL, returning -1

Problem:    Quickfix: mixup of FALSE and FAIL, returning -1.
Solution:   Use FAIL and INVALID_QFIDX. (Yegappan Lakshmanan)

diff --git a/src/quickfix.c b/src/quickfix.c
index cc6fe0a0757356d9cd35c82549f5c1f9d79b5e45..19127027ff137ab7881558dbb997af06d02da6df 100644 (file)
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -2351,7 +2351,7 @@ qf_jump_edit_buffer(
        if (!can_abandon(curbuf, forceit))
        {
            no_write_message();
-           retval = FALSE;
+           retval = FAIL;
        }
        else
            retval = do_ecmd(qf_ptr->qf_fnum, NULL, NULL, NULL, (linenr_T)1,
@@ -2395,7 +2395,7 @@ qf_jump_edit_buffer(
        }
 
        if (*abort)
-           retval = FALSE;
+           retval = FAIL;
     }
 
     return retval;
@@ -4172,7 +4172,7 @@ qf_id2nr(qf_info_T *qi, int_u qfid)
     for (qf_idx = 0; qf_idx < qi->qf_listcount; qf_idx++)
        if (qi->qf_lists[qf_idx].qf_id == qfid)
            return qf_idx;
-    return -1;
+    return INVALID_QFIDX;
 }
 
 /*
@@ -4889,7 +4889,7 @@ get_errorlist(qf_info_T *qi_arg, win_T *wp, int qf_idx, list_T *list)
        }
     }
 
-    if (qf_idx == -1)
+    if (qf_idx == INVALID_QFIDX)
        qf_idx = qi->qf_curlist;
 
     if (qf_idx >= qi->qf_listcount

diff --git a/src/version.c b/src/version.c
index c7637a3fa4bfd7a8a79e1ada87335a109e773c7e..40b5815b1f6b83a987386053bedf08cc4c057c0b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1772,
 /**/
     1771,
 /**/