Mercurial > vim

changeset 13800:e4dc4ede9ef8 v8.0.1772

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1772: quickfix: mixup of FALSE and FAIL, returning -1 commit https://github.com/vim/vim/commit/29ce409bfca52bb8a07e2975d06fd788458e9861 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Apr 28 21:56:44 2018 +0200 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)
author Christian Brabandt <cb@256bit.org>
date Sat, 28 Apr 2018 22:00:06 +0200
parents 1f952efc50ff
children bc05f0849f3a
files src/quickfix.c src/version.c
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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 *
 	}
     }
 
-    if (qf_idx == -1)
+    if (qf_idx == INVALID_QFIDX)
 	qf_idx = qi->qf_curlist;
 
     if (qf_idx >= qi->qf_listcount
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1772,
+/**/
     1771,
 /**/
     1770,