To: vim_dev@googlegroups.com Subject: Patch 8.0.1772 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1772 Problem: Quickfix: mixup of FALSE and FAIL, returning -1. Solution: Use FAIL and INVALID_QFIDX. (Yegappan Lakshmanan) Files: src/quickfix.c *** ../vim-8.0.1771/src/quickfix.c 2018-04-24 15:48:05.776784393 +0200 --- src/quickfix.c 2018-04-28 21:50:47.616600349 +0200 *************** *** 2351,2357 **** if (!can_abandon(curbuf, forceit)) { no_write_message(); ! retval = FALSE; } else retval = do_ecmd(qf_ptr->qf_fnum, NULL, NULL, NULL, (linenr_T)1, --- 2351,2357 ---- if (!can_abandon(curbuf, forceit)) { no_write_message(); ! retval = FAIL; } else retval = do_ecmd(qf_ptr->qf_fnum, NULL, NULL, NULL, (linenr_T)1, *************** *** 2395,2401 **** } if (*abort) ! retval = FALSE; } return retval; --- 2395,2401 ---- } if (*abort) ! retval = FAIL; } return retval; *************** *** 4172,4178 **** 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; } /* --- 4172,4178 ---- for (qf_idx = 0; qf_idx < qi->qf_listcount; qf_idx++) if (qi->qf_lists[qf_idx].qf_id == qfid) return qf_idx; ! return INVALID_QFIDX; } /* *************** *** 4889,4895 **** } } ! if (qf_idx == -1) qf_idx = qi->qf_curlist; if (qf_idx >= qi->qf_listcount --- 4889,4895 ---- } } ! if (qf_idx == INVALID_QFIDX) qf_idx = qi->qf_curlist; if (qf_idx >= qi->qf_listcount *** ../vim-8.0.1771/src/version.c 2018-04-28 21:34:35.866806116 +0200 --- src/version.c 2018-04-28 21:51:57.388137623 +0200 *************** *** 763,764 **** --- 763,766 ---- { /* Add new patch number below this line */ + /**/ + 1772, /**/ -- Linux is just like a wigwam: no Windows, no Gates and an Apache inside. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///