Mercurial > vim
changeset 14507:5a10a0020c3e v8.1.0267
patch 8.1.0267: no good check if restoring quickfix list worked
commit https://github.com/vim/vim/commit/90f1e2b7bcf56112e1535b693acf131727179a6e
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Aug 11 13:36:56 2018 +0200
patch 8.1.0267: no good check if restoring quickfix list worked
Problem: No good check if restoring quickfix list worked.
Solution: Let qf_restore_list() return OK/FAIL. (Yegappan Lakshmanan)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 11 Aug 2018 13:45:04 +0200 |
parents | e6ed8002bed4 |
children | 7336a81d18c4 |
files | src/quickfix.c src/version.c |
diffstat | 2 files changed, 20 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/quickfix.c +++ b/src/quickfix.c @@ -4338,8 +4338,10 @@ qf_id2nr(qf_info_T *qi, int_u qfid) * If the current list is not "save_qfid" and we can find the list with that ID * then make it the current list. * This is used when autocommands may have changed the current list. - */ - static void + * Returns OK if successfully restored the list. Returns FAIL if the list with + * the specified identifier (save_qfid) is not found in the stack. + */ + static int qf_restore_list(qf_info_T *qi, int_u save_qfid) { int curlist; @@ -4347,10 +4349,12 @@ qf_restore_list(qf_info_T *qi, int_u sav if (qi->qf_lists[qi->qf_curlist].qf_id != save_qfid) { curlist = qf_id2nr(qi, save_qfid); - if (curlist >= 0) - qi->qf_curlist = curlist; - // else: what if the list can't be found? - } + if (curlist < 0) + // list is not present + return FAIL; + qi->qf_curlist = curlist; + } + return OK; } /* @@ -4359,9 +4363,10 @@ qf_restore_list(qf_info_T *qi, int_u sav static void qf_jump_first(qf_info_T *qi, int_u save_qfid, int forceit) { - qf_restore_list(qi, save_qfid); - - // Autocommands might have cleared the list, check for it + if (qf_restore_list(qi, save_qfid) == FAIL) + return; + + // Autocommands might have cleared the list, check for that. if (!qf_list_empty(qi, qi->qf_curlist)) qf_jump(qi, 0, 0, forceit); } @@ -5025,7 +5030,8 @@ vgr_qflist_valid( } } - qf_restore_list(qi, qfid); + if (qf_restore_list(qi, qfid) == FAIL) + return FALSE; return TRUE; } @@ -5371,7 +5377,8 @@ ex_vimgrep(exarg_T *eap) if (!qflist_valid(wp, save_qfid)) goto theend; - qf_restore_list(qi, save_qfid); + if (qf_restore_list(qi, save_qfid) == FAIL) + goto theend; /* Jump to first match. */ if (!qf_list_empty(qi, qi->qf_curlist))